From 311c9ee54ea963ff69bd3a2e6981c37e893b4c3e Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 20 Jul 2021 14:04:51 -0300 Subject: 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 --- elf/dl-close.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'elf/dl-close.c') 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. */ -- cgit 1.4.1