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
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
commit f407a14ff7788cb6158d91d2cd9850f218e796d3
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Aug 9 16:06:40 2024 +0200
|
|
|
|
elf: Call la_objclose for proxy link maps in _dl_fini (bug 32065)
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit c4b160744cb39eca20dc36b39c7fa6e10352706c)
|
|
|
|
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
|
|
index db996270de65e86a..a1a4c25829471510 100644
|
|
--- a/elf/dl-fini.c
|
|
+++ b/elf/dl-fini.c
|
|
@@ -69,6 +69,7 @@ _dl_fini (void)
|
|
|
|
unsigned int i;
|
|
struct link_map *l;
|
|
+ struct link_map *proxy_link_map = NULL;
|
|
assert (nloaded != 0 || GL(dl_ns)[ns]._ns_loaded == NULL);
|
|
for (l = GL(dl_ns)[ns]._ns_loaded, i = 0; l != NULL; l = l->l_next)
|
|
/* Do not handle ld.so in secondary namespaces. */
|
|
@@ -84,6 +85,11 @@ _dl_fini (void)
|
|
are not dlclose()ed from underneath us. */
|
|
++l->l_direct_opencount;
|
|
}
|
|
+ else
|
|
+ /* Used below to call la_objclose for the ld.so proxy
|
|
+ link map. */
|
|
+ proxy_link_map = l;
|
|
+
|
|
assert (ns != LM_ID_BASE || i == nloaded);
|
|
assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1);
|
|
unsigned int nmaps = i;
|
|
@@ -122,6 +128,9 @@ _dl_fini (void)
|
|
--l->l_direct_opencount;
|
|
}
|
|
|
|
+ if (proxy_link_map != NULL)
|
|
+ _dl_audit_objclose (proxy_link_map);
|
|
+
|
|
#ifdef SHARED
|
|
_dl_audit_activity_nsid (ns, LA_ACT_CONSISTENT);
|
|
#endif
|
|
diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c
|
|
index 32759f956a4b3c58..78b4ee384cfb0fe9 100644
|
|
--- a/elf/tst-audit23.c
|
|
+++ b/elf/tst-audit23.c
|
|
@@ -236,13 +236,26 @@ do_test (int argc, char *argv[])
|
|
}
|
|
}
|
|
|
|
+ Lmid_t lmid_other = LM_ID_NEWLM;
|
|
+ unsigned int other_namespace_count = 0;
|
|
for (size_t i = 0; i < nobjs; i++)
|
|
{
|
|
- /* This subtest currently does not pass because of bug 32065. */
|
|
- if (! (endswith (objs[i].lname, LD_SO) && objs[i].lmid != LM_ID_BASE))
|
|
- TEST_COMPARE (objs[i].closed, true);
|
|
+ if (objs[i].lmid != LM_ID_BASE)
|
|
+ {
|
|
+ if (lmid_other == LM_ID_NEWLM)
|
|
+ lmid_other = objs[i].lmid;
|
|
+ TEST_COMPARE (objs[i].lmid, lmid_other);
|
|
+ ++other_namespace_count;
|
|
+ if (!(endswith (objs[i].lname, "/" LIBC_SO)
|
|
+ || endswith (objs[i].lname, "/" LD_SO)))
|
|
+ FAIL ("unexpected object in secondary namespace: %s",
|
|
+ objs[i].lname);
|
|
+ }
|
|
+ TEST_COMPARE (objs[i].closed, true);
|
|
free (objs[i].lname);
|
|
}
|
|
+ /* Both libc.so and ld.so should be present. */
|
|
+ TEST_COMPARE (other_namespace_count, 2);
|
|
|
|
/* la_activity(LA_ACT_CONSISTENT) should be the last callback received.
|
|
Since only one link map may be not-CONSISTENT at a time, this also
|