53f4d259fa
Upstream commit: fffc2df8a3e2c8cda2991063d23086360268b777 - i386: Provide GLIBC_ABI_GNU_TLS symbol version [BZ #33221] - i386: Update ___tls_get_addr to preserve vector registers - Extend struct r_debug to support multiple namespaces (RHEL-101985) - Fix a potential crash in the dynamic loader when processing specific symbol versions (RHEL-109683) - Signal la_objopen for ld.so with dlmopen (RHEL-109693) - Switch to main malloc after final ld.so self-relocation (RHEL-109703) - Prevent ld.so from asserting and crashing during audited library loads (RHEL-109702) - x86-64: Provide GLIBC_ABI_DT_X86_64_PLT symbol version (RHEL-109621) - x86-64, i386: Provide GLIBC_ABI_GNU2_TLS symbol version (RHEL-109625) - Ensure fallback initialization of ctype TLS data pointers to fix segfaults in programs using dlmopen or auditors (RHEL-72018) - Handle load segment gaps in _dl_find_object (RHEL-104854) - AArch64: Improve codegen in SVE log1p - AArch64: Optimize inverse trig functions - AArch64: Avoid memset ifunc in cpu-features.c [BZ #33112] Resolves: RHEL-109536 Resolves: RHEL-72018 Resolves: RHEL-101985 Resolves: RHEL-104854 Resolves: RHEL-109621 Resolves: RHEL-109625 Resolves: RHEL-109683 Resolves: RHEL-109693 Resolves: RHEL-109702 Resolves: RHEL-109703
148 lines
5.9 KiB
Diff
148 lines
5.9 KiB
Diff
commit b2d8c6cbe70bbafb2238f0595c36fbedf64d00c2
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed Nov 6 10:33:44 2024 +0100
|
|
|
|
elf: rtld_multiple_ref is always true
|
|
|
|
For a long time, libc.so.6 has dependend on ld.so, which
|
|
means that there is a reference to ld.so in all processes,
|
|
and rtld_multiple_ref is always true. In fact, if
|
|
rtld_multiple_ref were false, some of the ld.so setup code
|
|
would not run.
|
|
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
(cherry picked from commit 8f8dd904c4a2207699bb666f30acceb5209c8d3f)
|
|
|
|
diff --git a/elf/rtld.c b/elf/rtld.c
|
|
index b308f7c9577b4bb3..41f8c329772b2b7a 100644
|
|
--- a/elf/rtld.c
|
|
+++ b/elf/rtld.c
|
|
@@ -2010,43 +2010,37 @@ dl_main (const ElfW(Phdr) *phdr,
|
|
if (main_map->l_searchlist.r_list[i] == &GL(dl_rtld_map))
|
|
break;
|
|
|
|
- bool rtld_multiple_ref = false;
|
|
- if (__glibc_likely (i < main_map->l_searchlist.r_nlist))
|
|
- {
|
|
- /* Some DT_NEEDED entry referred to the interpreter object itself, so
|
|
- put it back in the list of visible objects. We insert it into the
|
|
- chain in symbol search order because gdb uses the chain's order as
|
|
- its symbol search order. */
|
|
- rtld_multiple_ref = true;
|
|
+ /* Insert the link map for the dynamic loader into the chain in
|
|
+ symbol search order because gdb uses the chain's order as its
|
|
+ symbol search order. */
|
|
|
|
- GL(dl_rtld_map).l_prev = main_map->l_searchlist.r_list[i - 1];
|
|
- if (__glibc_likely (state.mode == rtld_mode_normal))
|
|
- {
|
|
- GL(dl_rtld_map).l_next = (i + 1 < main_map->l_searchlist.r_nlist
|
|
- ? main_map->l_searchlist.r_list[i + 1]
|
|
- : NULL);
|
|
+ GL(dl_rtld_map).l_prev = main_map->l_searchlist.r_list[i - 1];
|
|
+ if (__glibc_likely (state.mode == rtld_mode_normal))
|
|
+ {
|
|
+ GL(dl_rtld_map).l_next = (i + 1 < main_map->l_searchlist.r_nlist
|
|
+ ? main_map->l_searchlist.r_list[i + 1]
|
|
+ : NULL);
|
|
#ifdef NEED_DL_SYSINFO_DSO
|
|
- if (GLRO(dl_sysinfo_map) != NULL
|
|
- && GL(dl_rtld_map).l_prev->l_next == GLRO(dl_sysinfo_map)
|
|
- && GL(dl_rtld_map).l_next != GLRO(dl_sysinfo_map))
|
|
- GL(dl_rtld_map).l_prev = GLRO(dl_sysinfo_map);
|
|
+ if (GLRO(dl_sysinfo_map) != NULL
|
|
+ && GL(dl_rtld_map).l_prev->l_next == GLRO(dl_sysinfo_map)
|
|
+ && GL(dl_rtld_map).l_next != GLRO(dl_sysinfo_map))
|
|
+ GL(dl_rtld_map).l_prev = GLRO(dl_sysinfo_map);
|
|
#endif
|
|
- }
|
|
- else
|
|
- /* In trace mode there might be an invisible object (which we
|
|
- could not find) after the previous one in the search list.
|
|
- In this case it doesn't matter much where we put the
|
|
- interpreter object, so we just initialize the list pointer so
|
|
- that the assertion below holds. */
|
|
- GL(dl_rtld_map).l_next = GL(dl_rtld_map).l_prev->l_next;
|
|
-
|
|
- assert (GL(dl_rtld_map).l_prev->l_next == GL(dl_rtld_map).l_next);
|
|
- GL(dl_rtld_map).l_prev->l_next = &GL(dl_rtld_map);
|
|
- if (GL(dl_rtld_map).l_next != NULL)
|
|
- {
|
|
- assert (GL(dl_rtld_map).l_next->l_prev == GL(dl_rtld_map).l_prev);
|
|
- GL(dl_rtld_map).l_next->l_prev = &GL(dl_rtld_map);
|
|
- }
|
|
+ }
|
|
+ else
|
|
+ /* In trace mode there might be an invisible object (which we
|
|
+ could not find) after the previous one in the search list.
|
|
+ In this case it doesn't matter much where we put the
|
|
+ interpreter object, so we just initialize the list pointer so
|
|
+ that the assertion below holds. */
|
|
+ GL(dl_rtld_map).l_next = GL(dl_rtld_map).l_prev->l_next;
|
|
+
|
|
+ assert (GL(dl_rtld_map).l_prev->l_next == GL(dl_rtld_map).l_next);
|
|
+ GL(dl_rtld_map).l_prev->l_next = &GL(dl_rtld_map);
|
|
+ if (GL(dl_rtld_map).l_next != NULL)
|
|
+ {
|
|
+ assert (GL(dl_rtld_map).l_next->l_prev == GL(dl_rtld_map).l_prev);
|
|
+ GL(dl_rtld_map).l_next->l_prev = &GL(dl_rtld_map);
|
|
}
|
|
|
|
/* Now let us see whether all libraries are available in the
|
|
@@ -2374,35 +2368,33 @@ dl_main (const ElfW(Phdr) *phdr,
|
|
/* Make sure no new search directories have been added. */
|
|
assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
|
|
|
|
- if (rtld_multiple_ref)
|
|
- {
|
|
- /* There was an explicit ref to the dynamic linker as a shared lib.
|
|
- Re-relocate ourselves with user-controlled symbol definitions.
|
|
+ /* Re-relocate ourselves with user-controlled symbol definitions.
|
|
|
|
- We must do this after TLS initialization in case after this
|
|
- re-relocation, we might call a user-supplied function
|
|
- (e.g. calloc from _dl_relocate_object) that uses TLS data. */
|
|
+ We must do this after TLS initialization in case after this
|
|
+ re-relocation, we might call a user-supplied function
|
|
+ (e.g. calloc from _dl_relocate_object) that uses TLS data. */
|
|
|
|
- /* Set up the object lookup structures. */
|
|
- _dl_find_object_init ();
|
|
+ /* Set up the object lookup structures. */
|
|
+ _dl_find_object_init ();
|
|
|
|
- /* The malloc implementation has been relocated, so resolving
|
|
- its symbols (and potentially calling IFUNC resolvers) is safe
|
|
- at this point. */
|
|
- __rtld_malloc_init_real (main_map);
|
|
+ /* The malloc implementation has been relocated, so resolving
|
|
+ its symbols (and potentially calling IFUNC resolvers) is safe
|
|
+ at this point. */
|
|
+ __rtld_malloc_init_real (main_map);
|
|
|
|
- /* Likewise for the locking implementation. */
|
|
- __rtld_mutex_init ();
|
|
+ /* Likewise for the locking implementation. */
|
|
+ __rtld_mutex_init ();
|
|
|
|
- RTLD_TIMING_VAR (start);
|
|
- rtld_timer_start (&start);
|
|
+ {
|
|
+ RTLD_TIMING_VAR (start);
|
|
+ rtld_timer_start (&start);
|
|
|
|
- /* Mark the link map as not yet relocated again. */
|
|
- GL(dl_rtld_map).l_relocated = 0;
|
|
- _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope, 0, 0);
|
|
+ /* Mark the link map as not yet relocated again. */
|
|
+ GL(dl_rtld_map).l_relocated = 0;
|
|
+ _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope, 0, 0);
|
|
|
|
- rtld_timer_accum (&relocate_time, start);
|
|
- }
|
|
+ rtld_timer_accum (&relocate_time, start);
|
|
+ }
|
|
|
|
/* Relocation is complete. Perform early libc initialization. This
|
|
is the initial libc, even if audit modules have been loaded with
|