diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-11-29 16:37:58 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-11-29 16:37:58 +0100 |
| commit | 6029860f6fb465ac35c68c71e3899b9b872b6b26 (patch) | |
| tree | ea9df4b6c0c1d30b02b9f08077498b723466bac6 /sysdeps/i386/dl-machine.h | |
| parent | a331150af65477fc3fa72ab341eed5e0b2daf7f3 (diff) | |
| download | glibc-fw/bug24214.tar.gz glibc-fw/bug24214.tar.xz glibc-fw/bug24214.zip | |
elf: Do not run IFUNC resolvers for LD_DEBUG=unused [BZ #24214] fw/bug24214
This commit adds missing skip_ifunc checks to aarch64, arm, i386, sparc, and x86_64. A new test case ensures that IRELATIVE IFUNC resolvers do not run in various diagnostic modes of the dynamic loader. Tested on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu, s390-linux-gnu, s390x-linux-gnu, powerpc64le-linux-gnu. Built with build-many-glibcs.py.
Diffstat (limited to 'sysdeps/i386/dl-machine.h')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 1e2a3b333d..e225aa3739 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -480,7 +480,8 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, break; case R_386_IRELATIVE: value = map->l_addr + *reloc_addr; - value = ((Elf32_Addr (*) (void)) value) (); + if (__glibc_likely (!skip_ifunc)) + value = ((Elf32_Addr (*) (void)) value) (); *reloc_addr = value; break; default: @@ -627,7 +628,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, # endif /* !RESOLVE_CONFLICT_FIND_MAP */ case R_386_IRELATIVE: value = map->l_addr + reloc->r_addend; - value = ((Elf32_Addr (*) (void)) value) (); + if (__glibc_likely (!skip_ifunc)) + value = ((Elf32_Addr (*) (void)) value) (); *reloc_addr = value; break; default: |