niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

elf: Signal la_objopen for the proxy link map in dlmopen (bug 31985)

Browse source 
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>
This commit is contained in:
Florian Weimer 2024-08-09 15:31:18 +02:00
parent a20bc2f623
commit 8f36b14696
2 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
elf/dl-load.c
View file

@ -902,6 +902,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 /* Map in the shared object NAME, actually located in REALNAME, and already
opened on FD. */ opened on FD. */
@ -1002,6 +1033,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. */ /* Add the map for the mirrored object to the object list. */
_dl_add_to_namespace_list (l, nsid); _dl_add_to_namespace_list (l, nsid);
_dl_notify_new_object (mode, nsid, l);
return l; return l;
} }
#endif #endif
@ -1426,33 +1459,7 @@ cannot enable executable stack as shared object requires");
if (mode & __RTLD_SPROF) if (mode & __RTLD_SPROF)
return l; return l;
/* Signal that we are going to add new objects. */ _dl_notify_new_object (mode, nsid, l);
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
return l; return l;
} }

8
elf/tst-audit23.c
View file

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <array_length.h> #include <array_length.h>
#include <endswith.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <link.h> #include <link.h>
@ -106,8 +107,9 @@ do_test (int argc, char *argv[])
4. libgcc_s.so (one some architectures, for libsupport) 4. libgcc_s.so (one some architectures, for libsupport)
5. tst-audit23mod.so 5. tst-audit23mod.so
6. libc.so (LM_ID_NEWLM). 6. libc.so (LM_ID_NEWLM).
7. loader (proxy link map in new namespace)
vdso (optional and ignored). */ vdso (optional and ignored). */
enum { max_objs = 6 }; enum { max_objs = 7 };
struct la_obj_t struct la_obj_t
{ {
char *lname; char *lname;
@ -236,7 +238,9 @@ do_test (int argc, char *argv[])
for (size_t i = 0; i < nobjs; i++) 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); free (objs[i].lname);
} }