72524e00c3
- Backport: Extend struct r_debug to support multiple namespaces [BZ #15971] - Backport: elf: Include <sysdep.h> in elf/dl-debug-symbols.S - Backport: Minor: don't call _dl_debug_update (which can have side effects) inside assert - Backport: elf: Run constructors on cyclic recursive dlopen (bug 31986) - Backport: elf: Signal LA_ACT_CONSISTENT to auditors after RT_CONSISTENT switch - Backport: elf: Signal RT_CONSISTENT after relocation processing in dlopen (bug 31986) - Backport: Revert "elf: Run constructors on cyclic recursive dlopen (bug 31986)" - Backport: elf: Test dlopen (NULL, RTLD_LAZY) from an ELF constructor - Backport: elf: Fix map_complete Systemtap probe in dl_open_worker - Backport: elf: Introduce separate _r_debug_array variable - Add downstream patch to keep the ABI stable Resolves: RHEL-47403
25 lines
792 B
Diff
25 lines
792 B
Diff
commit ac73067cb7a328bf106ecd041c020fc61be7e087
|
|
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)").
|
|
|
|
diff --git a/elf/dl-open.c b/elf/dl-open.c
|
|
index c225654822ee3520..1e61e402455da666 100644
|
|
--- a/elf/dl-open.c
|
|
+++ b/elf/dl-open.c
|
|
@@ -789,7 +789,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)
|