diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-10-10 11:13:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-10-10 11:13:11 +0000 |
| commit | 6bc6bd3b10e6c2fd4c656647aa643919b0519825 (patch) | |
| tree | 13e502e2eac180e65c0eeb0c62defdac6bab29c3 /elf/dl-load.c | |
| parent | b8c80a7e0da28b6e94411ce7d589d2b09674b4b9 (diff) | |
| download | glibc-6bc6bd3b10e6c2fd4c656647aa643919b0519825.tar.gz glibc-6bc6bd3b10e6c2fd4c656647aa643919b0519825.tar.xz glibc-6bc6bd3b10e6c2fd4c656647aa643919b0519825.zip | |
Don't use INTVARDEF/INTUSE with __libc_enable_secure (bug 14132).
Continuing the removal of the obsolete INTDEF / INTVARDEF / INTUSE mechanism, this patch replaces its use for __libc_enable_secure with the use of rtld_hidden_data_def and rtld_hidden_proto. Tested for x86_64 that installed stripped shared libraries are unchanged by the patch. [BZ #14132] * elf/dl-sysdep.c (__libc_enable_secure): Use rtld_hidden_data_def instead of INTVARDEF. (_dl_sysdep_start): Do not use INTUSE with __libc_enable_secure. * sysdeps/mach/hurd/dl-sysdep.c (__libc_enable_secure): Use rtld_hidden_data_def instead of INTVARDEF. (_dl_sysdep_start): Do not use INTUSE with __libc_enable_secure. * elf/dl-deps.c (expand_dst): Likewise. * elf/dl-load.c (_dl_dst_count): Likewise. (_dl_dst_substitute): Likewise. (decompose_rpath): Likewise. (_dl_init_paths): Likewise. (open_path): Likewise. (_dl_map_object): Likewise. * elf/rtld.c (dl_main): Likewise. (process_dl_audit): Likewise. (process_envvars): Likewise. * include/unistd.h [IS_IN_rtld] (__libc_enable_secure_internal): Remove declaration. (__libc_enable_secure): Use rtld_hidden_proto.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index fde7137517..9dd40e3d0a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -262,7 +262,7 @@ _dl_dst_count (const char *name, int is_path) is $ORIGIN alone) and it must always appear first in path. */ ++name; if ((len = is_dst (start, name, "ORIGIN", is_path, - INTUSE(__libc_enable_secure))) != 0 + __libc_enable_secure)) != 0 || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) ++cnt; @@ -298,10 +298,10 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, ++name; if ((len = is_dst (start, name, "ORIGIN", is_path, - INTUSE(__libc_enable_secure))) != 0) + __libc_enable_secure)) != 0) { repl = l->l_origin; - check_for_trusted = (INTUSE(__libc_enable_secure) + check_for_trusted = (__libc_enable_secure && l->l_type == lt_executable); } else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) @@ -563,7 +563,7 @@ decompose_rpath (struct r_search_path_struct *sps, /* First see whether we must forget the RUNPATH and RPATH from this object. */ if (__glibc_unlikely (GLRO(dl_inhibit_rpath) != NULL) - && !INTUSE(__libc_enable_secure)) + && !__libc_enable_secure) { const char *inhp = GLRO(dl_inhibit_rpath); @@ -828,7 +828,7 @@ _dl_init_paths (const char *llp) } (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;", - INTUSE(__libc_enable_secure), "LD_LIBRARY_PATH", + __libc_enable_secure, "LD_LIBRARY_PATH", NULL, l); if (env_path_list.dirs[0] == NULL) @@ -1842,7 +1842,7 @@ open_path (const char *name, size_t namelen, int mode, here_any |= this_dir->status[cnt] != nonexisting; if (fd != -1 && __glibc_unlikely (mode & __RTLD_SECURE) - && INTUSE(__libc_enable_secure)) + && __libc_enable_secure) { /* This is an extra security effort to make sure nobody can preload broken shared objects which are in the trusted @@ -2054,7 +2054,7 @@ _dl_map_object (struct link_map *loader, const char *name, #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) - || ! INTUSE(__libc_enable_secure)) + || ! __libc_enable_secure) && __glibc_likely (GLRO(dl_inhibit_cache) == 0)) { /* Check the list of libraries in the file /etc/ld.so.cache, |