diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/dl-load.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3ed611e340..62fd68d4dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-07-22 Ulrich Drepper <drepper@redhat.com> + * elf/dl-load.c (_dl_dst_count): In SUID binaries expand $ORIGIN + if it is alone. + (_dl_dst_substitute): Likewise. + * iconv/iconvconfig.c: Remove --verbose option. Comment out mcheck_verbose call. diff --git a/elf/dl-load.c b/elf/dl-load.c index 46b7d81412..b9ef523b49 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -180,8 +180,8 @@ _dl_dst_count (const char *name, int is_path) { size_t len = 1; - /* $ORIGIN is not expanded for SUID/GUID programs and it must - always appear first in path. + /* $ORIGIN is not expanded for SUID/GUID programs (except if it + is $ORIGIN alone) and it must always appear first in path. Note that it is no bug that the string in the second and fourth `strncmp' call is longer than the sequence which is @@ -192,7 +192,8 @@ _dl_dst_count (const char *name, int is_path) || (is_path && name[7] == ':')) && (len = 7) != 0))) { - if (__builtin_expect (!__libc_enable_secure, 1) + if ((__builtin_expect (!__libc_enable_secure, 1) + || name[len] == '\0' || (is_path && name[len] == ':')) && (name == start || (is_path && name[-1] == ':'))) ++cnt; } @@ -241,7 +242,8 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, || (is_path && name[7] == ':')) && (len = 7) != 0))) { - if (__builtin_expect (!__libc_enable_secure, 1) + if ((__builtin_expect (!__libc_enable_secure, 1) + || name[len] == '\0' || (is_path && name[len] == ':')) && (name == start || (is_path && name[-1] == ':'))) repl = l->l_origin; } |