AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 22:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(_dl_dst_count): Allow $ORIGIN to point to directory with the

Browse Source 
reference since this is as secure as using the object with the
dependency.
(_dl_dst_count): Change strings in first two strncmp calls to allow reuse.
(_dl_dst_substitute): Likewise.
This commit is contained in:
Ulrich Drepper 1999-11-10 03:16:42 +00:00
parent 75e663ce44
commit 9f5ceff32f
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
elf/dl-load.c
View File

@ -156,14 +156,20 @@ _dl_dst_count (const char *name, int is_path)
size_t len = 1;
/* $ORIGIN is not expanded for SUID/GUID programs. */
if ((((!__libc_enable_secure
&& strncmp (&name[1], "ORIGIN", 6) == 0 && (len = 7) != 0)
|| (strncmp (&name[1], "PLATFORM", 8) == 0 && (len = 9) != 0))
if ((((strncmp (&name[1], "ORIGIN}", 6) == 0
&& (!__libc_enable_secure
|| ((name[7] == '\0' || (is_path && name[7] == ':'))
&& (name == start || (is_path && name[-1] == ':'))))
&& (len = 7) != 0)
|| (strncmp (&name[1], "PLATFORM}", 8) == 0 && (len = 9) != 0))
&& (name[len] == '\0' || name[len] == '/'
|| (is_path && name[len] == ':')))
|| (name[1] == '{'
&& ((!__libc_enable_secure
&& strncmp (&name[2], "ORIGIN}", 7) == 0 && (len = 9) != 0)
&& ((strncmp (&name[2], "ORIGIN}", 7) == 0
&& (!__libc_enable_secure
|| ((name[9] == '\0' || (is_path && name[9] == ':'))
&& (name == start || (is_path && name[-1] == ':'))))
&& (len = 9) != 0)
|| (strncmp (&name[2], "PLATFORM}", 9) == 0
&& (len = 11) != 0))))
++cnt;
@ -195,8 +201,8 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
const char *repl;
size_t len;
if ((((strncmp (&name[1], "ORIGIN", 6) == 0 && (len = 7) != 0)
|| (strncmp (&name[1], "PLATFORM", 8) == 0 && (len = 9) != 0))
if ((((strncmp (&name[1], "ORIGIN}", 6) == 0 && (len = 7) != 0)
|| (strncmp (&name[1], "PLATFORM}", 8) == 0 && (len = 9) != 0))
&& (name[len] == '\0' || name[len] == '/'
|| (is_path && name[len] == ':')))
|| (name[1] == '{'
@ -205,7 +211,12 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
&& (len = 11) != 0))))
{
repl = ((len == 7 || name[2] == 'O')
? (__libc_enable_secure ? NULL : l->l_origin)
? (__libc_enable_secure
&& ((name[len] != '\0'
&& (!is_path || name[len] != ':'))
|| (name != start
&& (!is_path || name[-1] != ':')))
? NULL : l->l_origin)
: _dl_platform);
if (repl != NULL && repl != (const char *) -1)
@ -656,9 +667,9 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
#define ELF32_CLASS ELFCLASS32
#define ELF64_CLASS ELFCLASS64
#if !defined VALID_ELF_HEADER
# define VALID_ELF_HEADER(hdr,exp,size) (memcmp(hdr,exp,size) == 0)
# define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV)
# define VALID_ELF_ABIVERSION(ver) (ver == 0)
# define VALID_ELF_HEADER(hdr,exp,size) (memcmp(hdr,exp,size) == 0)
# define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV)
# define VALID_ELF_ABIVERSION(ver) (ver == 0)
#endif
static const unsigned char expected[EI_PAD] =
{