diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-07-20 14:04:51 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-12-28 08:40:38 -0300 |
| commit | 311c9ee54ea963ff69bd3a2e6981c37e893b4c3e (patch) | |
| tree | 233f3472a08ff1c44d0d4ef2e079c002de3c887e /elf | |
| parent | c91008d3490e4e3ce29520068405f081f0d368ca (diff) | |
| download | glibc-311c9ee54ea963ff69bd3a2e6981c37e893b4c3e.tar.gz glibc-311c9ee54ea963ff69bd3a2e6981c37e893b4c3e.tar.xz glibc-311c9ee54ea963ff69bd3a2e6981c37e893b4c3e.zip | |
elf: Add _dl_audit_objclose
It consolidates the code required to call la_objclose audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-audit.c | 21 | ||||
| -rw-r--r-- | elf/dl-close.c | 20 | ||||
| -rw-r--r-- | elf/dl-fini.c | 16 |
3 files changed, 23 insertions, 34 deletions
diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 5682427220..cb1c3de93c 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -85,3 +85,24 @@ _dl_audit_objopen (struct link_map *l, Lmid_t nsid) afct = afct->next; } } + +void +_dl_audit_objclose (struct link_map *l) +{ + if (__glibc_likely (GLRO(dl_naudit) == 0) + || GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) + return; + + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + if (afct->objclose != NULL) + { + struct auditstate *state= link_map_audit_state (l, cnt); + /* Return value is ignored. */ + afct->objclose (&state->cookie); + } + + afct = afct->next; + } +} diff --git a/elf/dl-close.c b/elf/dl-close.c index 33c8d044a8..97f09e6dc7 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -260,9 +260,6 @@ _dl_close_worker (struct link_map *map, bool force) _dl_sort_maps (maps, nloaded, (nsid == LM_ID_BASE), true); /* Call all termination functions at once. */ -#ifdef SHARED - bool do_audit = GLRO(dl_naudit) > 0 && !ns->_ns_loaded->l_auditing; -#endif bool unload_any = false; bool scope_mem_left = false; unsigned int unload_global = 0; @@ -296,22 +293,7 @@ _dl_close_worker (struct link_map *map, bool force) #ifdef SHARED /* Auditing checkpoint: we remove an object. */ - if (__glibc_unlikely (do_audit)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objclose != NULL) - { - struct auditstate *state - = link_map_audit_state (imap, cnt); - /* Return value is ignored. */ - (void) afct->objclose (&state->cookie); - } - - afct = afct->next; - } - } + _dl_audit_objclose (imap); #endif /* This object must not be used anymore. */ diff --git a/elf/dl-fini.c b/elf/dl-fini.c index c683884c35..b789cfb9f2 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -146,21 +146,7 @@ _dl_fini (void) #ifdef SHARED /* Auditing checkpoint: another object closed. */ - if (!do_audit && __builtin_expect (GLRO(dl_naudit) > 0, 0)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objclose != NULL) - { - struct auditstate *state - = link_map_audit_state (l, cnt); - /* Return value is ignored. */ - (void) afct->objclose (&state->cookie); - } - afct = afct->next; - } - } + _dl_audit_objclose (l); #endif } |