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/dl-deps.c | |
| parent | cb81264fd9973cd95bbc71495185b98979d28918 (diff) | |
| download | glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.zip glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.tar.gz glibc-9ffa50b26b0cb5d3043adf6d3d0b1ea735acc147.tar.bz2 | |
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/dl-deps.c')
| -rw-r--r-- | elf/dl-deps.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index b5a4323..7a8d8ce 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -611,7 +611,12 @@ Filters not supported with LD_TRACE_PRELINKING")); memcpy (l_initfini, map->l_searchlist.r_list, nlist * sizeof (struct link_map *)); - _dl_sort_maps (&l_initfini[1], nlist - 1, NULL, false); + /* If libc.so.6 is the main map, it participates in the sort, so + that the relocation order is correct regarding libc.so.6. */ + if (l_initfini[0] == GL (dl_ns)[l_initfini[0]->l_ns].libc_map) + _dl_sort_maps (l_initfini, nlist, NULL, false); + else + _dl_sort_maps (&l_initfini[1], nlist - 1, NULL, false); /* Terminate the list of dependencies. */ l_initfini[nlist] = NULL; |