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-deps.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-deps.c')
-rw-r--r-- | elf/dl-deps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index f66b2669ac..b34039c4da 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -108,7 +108,7 @@ struct list char *__newp; \ \ /* DST must not appear in SUID/SGID programs. */ \ - if (INTUSE(__libc_enable_secure)) \ + if (__libc_enable_secure) \ _dl_signal_error (0, __str, NULL, N_("\ DST not allowed in SUID/SGID programs")); \ \ |