diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | elf/dl-support.c | 7 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 3 | ||||
| -rw-r--r-- | elf/rtld.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-origin.c | 47 |
6 files changed, 28 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog index 2415c65541..d69e8e7c6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-08-14 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): Undo all + change related to AT_EXECFN. We cannot use that string. + * sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Remove + _dl_execfn member. + * elf/dl-support.c: Remove _dl_execfn variable. + (_dl_aux_init): Remove handling of AT_EXECFN. + * elf/dl-sysdep.c (_dl_sysdep_start): Remove handling of AT_EXECFN. + * elf/rtld.c (process_envvars): Remove use of __ASSUME_AT_EXECFN. + 2008-08-13 Ulrich Drepper <drepper@redhat.com> [BZ #6544] diff --git a/elf/dl-support.c b/elf/dl-support.c index e5b74fb4d6..6bd573ec57 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -62,12 +62,8 @@ struct link_map *_dl_profile_map; /* This is the address of the last stack address ever used. */ void *__libc_stack_end; -#ifndef __ASSUME_AT_EXECFN /* Path where the binary is found. */ const char *_dl_origin_path; -#endif -/* File Name of the executable. */ -const char *_dl_execfn; /* Nonzero if runtime lookup should not update the .got/.plt. */ int _dl_bind_not; @@ -220,9 +216,6 @@ _dl_aux_init (ElfW(auxv_t) *av) __libc_enable_secure = av->a_un.a_val; __libc_enable_secure_decided = 1; break; - case AT_EXECFN: - GLRO(dl_execfn) = (void *) av->a_un.a_val; - break; # ifdef DL_PLATFORM_AUXV DL_PLATFORM_AUXV # endif diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 622eeb626b..e6f4272a63 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -173,9 +173,6 @@ _dl_sysdep_start (void **start_argptr, GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; #endif - case AT_EXECFN: - GLRO(dl_execfn) = (void *) av->a_un.a_val; - break; #ifdef DL_PLATFORM_AUXV DL_PLATFORM_AUXV #endif diff --git a/elf/rtld.c b/elf/rtld.c index 3f2267af0e..46bece7fa3 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2579,12 +2579,10 @@ process_envvars (enum mode *modep) break; case 11: -#ifndef __ASSUME_AT_EXECFN /* Path where the binary is found. */ if (!INTUSE(__libc_enable_secure) && memcmp (envline, "ORIGIN_PATH", 11) == 0) GLRO(dl_origin_path) = &envline[12]; -#endif break; case 12: diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 27c8fb620d..4d857404a3 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -593,13 +593,8 @@ struct rtld_global_ro /* Names of shared object for which the RPATH should be ignored. */ EXTERN const char *_dl_inhibit_rpath; -#ifndef __ASSUME_AT_EXECFN /* Location of the binary. */ EXTERN const char *_dl_origin_path; -#endif - - /* If set, points to the file name of the executable. */ - EXTERN const char *_dl_execfn; /* -1 if the dynamic linker should honor library load bias, 0 if not, -2 use the default (honor biases for normal diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c index 64e865b92a..a7fa53ea1d 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.c +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -1,5 +1,5 @@ /* Find path of executable. - Copyright (C) 1998-2000, 2002, 2004, 2008 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -36,28 +36,29 @@ const char * _dl_get_origin (void) { char linkval[PATH_MAX]; - const char *str; - char *result = (char *) -1l; + char *result; int len; + INTERNAL_SYSCALL_DECL (err); - str = GLRO(dl_execfn); - if (str == NULL || str[0] != '/') + len = INTERNAL_SYSCALL (readlink, err, 3, "/proc/self/exe", linkval, + sizeof (linkval)); + if (! INTERNAL_SYSCALL_ERROR_P (len, err) && len > 0 && linkval[0] != '[') { - INTERNAL_SYSCALL_DECL (err); - - len = INTERNAL_SYSCALL (readlink, err, 3, "/proc/self/exe", linkval, - sizeof (linkval)); - if (! INTERNAL_SYSCALL_ERROR_P (len, err) - && len > 0 && linkval[0] != '[') - str = linkval; + /* We can use this value. */ + assert (linkval[0] == '/'); + while (len > 1 && linkval[len - 1] != '/') + --len; + result = (char *) malloc (len + 1); + if (result == NULL) + result = (char *) -1; + else if (len == 1) + memcpy (result, "/", 2); else - str = NULL; + *((char *) __mempcpy (result, linkval, len - 1)) = '\0'; } else - len = strlen (str); - - if (str == NULL) { + result = (char *) -1; /* We use the environment variable LD_ORIGIN_PATH. If it is set make a copy and strip out trailing slashes. */ if (GLRO(dl_origin_path) != NULL) @@ -75,20 +76,6 @@ _dl_get_origin (void) } } } - else - { - /* We can use this value. */ - assert (str[0] == '/'); - while (len > 1 && str[len - 1] != '/') - --len; - result = (char *) malloc (len + 1); - if (result == NULL) - result = (char *) -1; - else if (len == 1) - memcpy (result, "/", 2); - else - *((char *) __mempcpy (result, str, len - 1)) = '\0'; - } return result; } |