diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-07-20 11:03:34 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-12-28 08:40:38 -0300 |
| commit | 3dac3959a5cb585b065cef2cb8a8d909c907e202 (patch) | |
| tree | 7cafc3b94478fc6050c7a6db09f98bf4ac448f9d /elf/rtld.c | |
| parent | aee6e90f93e285016b6cd9c8bd00402c19ba271b (diff) | |
| download | glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.tar glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.tar.gz glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.tar.bz2 glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.zip | |
elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid
It consolidates the code required to call la_activity audit
callback.
Also for a new Lmid_t the namespace link_map list are empty, so it
requires to check if before using it. This can happen for when audit
module is used along with dlmopen.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 6b8316e8a9..4952170621 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1794,18 +1794,7 @@ dl_main (const ElfW(Phdr) *phdr, /* Auditing checkpoint: we are ready to signal that the initial map is being constructed. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - afct->activity (&link_map_audit_state (main_map, cnt)->cookie, - LA_ACT_ADD); - - afct = afct->next; - } - } + _dl_audit_activity_map (main_map, LA_ACT_ADD); /* We have two ways to specify objects to preload: via environment variable and via the file /etc/ld.so.preload. The latter can also @@ -2486,23 +2475,7 @@ dl_main (const ElfW(Phdr) *phdr, #ifdef SHARED /* Auditing checkpoint: we have added all objects. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct link_map *head = GL(dl_ns)[LM_ID_BASE]._ns_loaded; - /* Do not call the functions for any auditing object. */ - if (head->l_auditing == 0) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - afct->activity (&link_map_audit_state (head, cnt)->cookie, - LA_ACT_CONSISTENT); - - afct = afct->next; - } - } - } + _dl_audit_activity_nsid (LM_ID_BASE, LA_ACT_CONSISTENT); #endif /* Notify the debugger all new objects are now ready to go. We must re-get |