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
27 lines
870 B
Diff
27 lines
870 B
Diff
commit 46e3ecad27f65dd239d6d3568b81338f4525585f
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Oct 25 17:41:53 2024 +0200
|
|
|
|
elf: Fix map_complete Systemtap probe in dl_open_worker
|
|
|
|
The refactoring did not take the change of variable into account.
|
|
Fixes commit 43db5e2c0672cae7edea7c9685b22317eae25471
|
|
("elf: Signal RT_CONSISTENT after relocation processing in dlopen
|
|
(bug 31986)").
|
|
|
|
(cherry picked from commit ac73067cb7a328bf106ecd041c020fc61be7e087)
|
|
|
|
diff --git a/elf/dl-open.c b/elf/dl-open.c
|
|
index 88e8ad8d3abcdd44..bd15f5f6a446115d 100644
|
|
--- a/elf/dl-open.c
|
|
+++ b/elf/dl-open.c
|
|
@@ -792,7 +792,7 @@ dl_open_worker (void *a)
|
|
#endif
|
|
r->r_state = RT_CONSISTENT;
|
|
_dl_debug_state ();
|
|
- LIBC_PROBE (map_complete, 3, nsid, r, new);
|
|
+ LIBC_PROBE (map_complete, 3, nsid, r, args->map);
|
|
|
|
#ifdef SHARED
|
|
if (was_not_consistent)
|