From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2191) id 08C163858C50; Tue, 29 Mar 2022 21:03:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08C163858C50 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Carlos O'Donell To: glibc-cvs@sourceware.org Subject: [glibc/codonell/ld-audit] elf: Add _dl_audit_objclose X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/codonell/ld-audit X-Git-Oldrev: 2e1f6346b6888063414f884b46952632cfdb2a51 X-Git-Newrev: 5e7f59255b86986607519c4cfcdeaedd0aec47f7 Message-Id: <20220329210358.08C163858C50@sourceware.org> Date: Tue, 29 Mar 2022 21:03:58 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2022 21:03:58 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5e7f59255b86986607519c4cfcdeaedd0aec47f7 commit 5e7f59255b86986607519c4cfcdeaedd0aec47f7 Author: Adhemerval Zanella Date: Tue Jul 20 14:04:51 2021 -0300 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 (cherry picked from commit 311c9ee54ea963ff69bd3a2e6981c37e893b4c3e) Diff: --- elf/dl-audit.c | 21 +++++++++++++++++++++ elf/dl-close.c | 20 +------------------- elf/dl-fini.c | 16 +--------------- 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