diff options
| -rw-r--r-- | elf/dl-audit.c | 21 | ||||
| -rw-r--r-- | elf/dl-close.c | 20 | ||||
| -rw-r--r-- | elf/dl-fini.c | 16 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 |
4 files changed, 27 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 0969a7e69e..b26d0f7e34 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -266,9 +266,6 @@ _dl_close_worker (struct link_map *map, bool force) used + (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; @@ -302,22 +299,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 6dbdfe4b3e..814854ed75 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -147,21 +147,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 } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9c3e92b9df..ee77c1a2a6 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1382,6 +1382,10 @@ void _dl_audit_activity_nsid (Lmid_t nsid, int action) namespace identification NSID. */ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) attribute_hidden; + +/* Call the la_objclose from the audit modules for the link_map L. */ +void _dl_audit_objclose (struct link_map *l) + attribute_hidden; #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED |