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
133 lines
4.2 KiB
Diff
133 lines
4.2 KiB
Diff
commit e27601b385fba1f3598168136021764166b819cf
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Aug 9 15:31:18 2024 +0200
|
|
|
|
elf: Signal la_objopen for the proxy link map in dlmopen (bug 31985)
|
|
|
|
Previously, the ld.so link map was silently added to the namespace.
|
|
This change produces an auditing event for it.
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit 8f36b1469677afe37168f9af1b77402d7a70c673)
|
|
|
|
diff --git a/elf/dl-load.c b/elf/dl-load.c
|
|
index ce8fdea3024359b0..75a7187c649e0202 100644
|
|
--- a/elf/dl-load.c
|
|
+++ b/elf/dl-load.c
|
|
@@ -929,6 +929,37 @@ _dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph)
|
|
}
|
|
}
|
|
|
|
+static void
|
|
+_dl_notify_new_object (int mode, Lmid_t nsid, struct link_map *l)
|
|
+{
|
|
+ /* Signal that we are going to add new objects. */
|
|
+ struct r_debug *r = _dl_debug_update (nsid);
|
|
+ if (r->r_state == RT_CONSISTENT)
|
|
+ {
|
|
+#ifdef SHARED
|
|
+ /* Auditing checkpoint: we are going to add new objects. Since this
|
|
+ is called after _dl_add_to_namespace_list the namespace is guaranteed
|
|
+ to not be empty. */
|
|
+ if ((mode & __RTLD_AUDIT) == 0)
|
|
+ _dl_audit_activity_nsid (nsid, LA_ACT_ADD);
|
|
+#endif
|
|
+
|
|
+ /* Notify the debugger we have added some objects. We need to
|
|
+ call _dl_debug_initialize in a static program in case dynamic
|
|
+ linking has not been used before. */
|
|
+ r->r_state = RT_ADD;
|
|
+ _dl_debug_state ();
|
|
+ LIBC_PROBE (map_start, 2, nsid, r);
|
|
+ }
|
|
+ else
|
|
+ assert (r->r_state == RT_ADD);
|
|
+
|
|
+#ifdef SHARED
|
|
+ /* Auditing checkpoint: we have a new object. */
|
|
+ if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing)
|
|
+ _dl_audit_objopen (l, nsid);
|
|
+#endif
|
|
+}
|
|
|
|
/* Map in the shared object NAME, actually located in REALNAME, and already
|
|
opened on FD. */
|
|
@@ -1029,6 +1060,8 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
|
|
/* Add the map for the mirrored object to the object list. */
|
|
_dl_add_to_namespace_list (l, nsid);
|
|
|
|
+ _dl_notify_new_object (mode, nsid, l);
|
|
+
|
|
return l;
|
|
}
|
|
#endif
|
|
@@ -1487,33 +1520,7 @@ cannot enable executable stack as shared object requires");
|
|
if (mode & __RTLD_SPROF)
|
|
return l;
|
|
|
|
- /* Signal that we are going to add new objects. */
|
|
- struct r_debug *r = _dl_debug_update (nsid);
|
|
- if (r->r_state == RT_CONSISTENT)
|
|
- {
|
|
-#ifdef SHARED
|
|
- /* Auditing checkpoint: we are going to add new objects. Since this
|
|
- is called after _dl_add_to_namespace_list the namespace is guaranteed
|
|
- to not be empty. */
|
|
- if ((mode & __RTLD_AUDIT) == 0)
|
|
- _dl_audit_activity_nsid (nsid, LA_ACT_ADD);
|
|
-#endif
|
|
-
|
|
- /* Notify the debugger we have added some objects. We need to
|
|
- call _dl_debug_initialize in a static program in case dynamic
|
|
- linking has not been used before. */
|
|
- r->r_state = RT_ADD;
|
|
- _dl_debug_state ();
|
|
- LIBC_PROBE (map_start, 2, nsid, r);
|
|
- }
|
|
- else
|
|
- assert (r->r_state == RT_ADD);
|
|
-
|
|
-#ifdef SHARED
|
|
- /* Auditing checkpoint: we have a new object. */
|
|
- if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing)
|
|
- _dl_audit_objopen (l, nsid);
|
|
-#endif
|
|
+ _dl_notify_new_object (mode, nsid, l);
|
|
|
|
return l;
|
|
}
|
|
diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c
|
|
index dada6bb1f8dabab5..32759f956a4b3c58 100644
|
|
--- a/elf/tst-audit23.c
|
|
+++ b/elf/tst-audit23.c
|
|
@@ -17,6 +17,7 @@
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <array_length.h>
|
|
+#include <endswith.h>
|
|
#include <errno.h>
|
|
#include <getopt.h>
|
|
#include <link.h>
|
|
@@ -106,8 +107,9 @@ do_test (int argc, char *argv[])
|
|
4. libgcc_s.so (one some architectures, for libsupport)
|
|
5. tst-audit23mod.so
|
|
6. libc.so (LM_ID_NEWLM).
|
|
+ 7. loader (proxy link map in new namespace)
|
|
vdso (optional and ignored). */
|
|
- enum { max_objs = 6 };
|
|
+ enum { max_objs = 7 };
|
|
struct la_obj_t
|
|
{
|
|
char *lname;
|
|
@@ -236,7 +238,9 @@ do_test (int argc, char *argv[])
|
|
|
|
for (size_t i = 0; i < nobjs; i++)
|
|
{
|
|
- TEST_COMPARE (objs[i].closed, true);
|
|
+ /* 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);
|
|
free (objs[i].lname);
|
|
}
|
|
|