diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-12-11 17:30:03 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-12-11 18:31:04 +0100 |
| commit | 9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147 (patch) | |
| tree | 282edafe2868969dc6e734377d9f88f317c28059 /elf/Makefile | |
| parent | cb81264fd9973cd95bbc71495185b98979d28918 (diff) | |
| download | glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.tar.gz glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.tar.xz glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.zip | |
elf: Include libc.so.6 as main program in dependency sort (bug 20972)
_dl_map_object_deps always sorts the initially loaded object first during dependency sorting. This means it is relocated last in dl_open_worker. This results in crashes in IFUNC resolvers without lazy bindings if libraries are preloaded that refer to IFUNCs in libc.so.6: the resolvers are called when libc.so.6 has not been relocated yet, so references to _rtld_global_ro etc. crash. The fix is to check against the libc.so.6 link map recorded by the __libc_early_init framework, and let it participate in the dependency sort. This fixes bug 20972. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile index 66ffbdd8dc..0b4d78c874 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -229,7 +229,7 @@ tests-internal += loadtest unload unload2 circleload1 \ tst-ptrguard1 tst-stackguard1 tst-libc_dlvsym \ tst-create_format1 tst-tls-surplus tst-dl-hwcaps_split tests-container += tst-pldd tst-dlopen-tlsmodid-container \ - tst-dlopen-self-container + tst-dlopen-self-container tst-preload-pthread-libc test-srcs = tst-pathopt selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null) ifneq ($(selinux-enabled),1) |