From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Cc: John Mellor-Crummey <johnmc@rice.edu>
Subject: [PATCH v3 09/20] elf: Add _dl_audit_objclose
Date: Fri, 30 Jul 2021 16:47:04 -0300 [thread overview]
Message-ID: <20210730194715.881900-10-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20210730194715.881900-1-adhemerval.zanella@linaro.org>
It consolidates the code required to call la_objclose() audit
callback.
No function change, checked on x86_64-linux-gnu.
---
elf/dl-audit.c | 21 +++++++++++++++++++++
elf/dl-close.c | 20 +-------------------
elf/dl-fini.c | 16 +---------------
sysdeps/generic/ldsodefs.h | 3 +++
4 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/elf/dl-audit.c b/elf/dl-audit.c
index de85ef1ddd..ef34ff761c 100644
--- a/elf/dl-audit.c
+++ b/elf/dl-audit.c
@@ -99,4 +99,25 @@ _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit)
afct = afct->next;
}
}
+
+void
+_dl_audit_objclose (struct link_map *l, Lmid_t nsid)
+{
+ 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;
+ }
+}
#endif
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 744621b11f..44484efd32 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, nsid);
#endif
/* This object must not be used anymore. */
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 6dbdfe4b3e..35a5471dcd 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, ns);
#endif
}
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index e920e1215b..fa56d43678 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1360,6 +1360,9 @@ void _dl_audit_activity_nsid (Lmid_t nsid, int action);
namespace identification NSID. If CHECK_AUDIT is set it will also check
if main mapping of the namespace is an audit modules. */
void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit);
+/* Call the la_objclose () from audit modules for the link_map L on the
+ namespace identification NSID. */
+void _dl_audit_objclose (struct link_map *l, Lmid_t nsid);
#endif /* SHARED */
#if PTHREAD_IN_LIBC && defined SHARED
--
2.30.2
next prev parent reply other threads:[~2021-07-30 19:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 19:46 [PATCH v3 00/20] Some rtld-audit fixes Adhemerval Zanella via Libc-alpha
2021-07-30 19:46 ` [PATCH v3 01/20] elf: Avoid unnecessary slowdown from profiling with audit (BZ#15533) Adhemerval Zanella via Libc-alpha
2021-07-30 19:46 ` [PATCH v3 02/20] elf: Add audit tests for modules with TLSDESC Adhemerval Zanella via Libc-alpha
2021-07-30 19:46 ` [PATCH v3 03/20] elf: Do not fail for failed dlopem on audit modules (BZ #28061) Adhemerval Zanella via Libc-alpha
2021-07-30 19:46 ` [PATCH v3 04/20] elf: Suppress audit calls when a (new) namespace is empty (BZ #28062) Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 05/20] elf: Fix initial-exec TLS access on audit modules (BZ #28096) Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 06/20] elf: Add _dl_audit_objopen Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 07/20] elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 08/20] elf: Add _dl_audit_objsearch Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` Adhemerval Zanella via Libc-alpha [this message]
2021-07-30 19:47 ` [PATCH v3 10/20] elf: Add _dl_audit_symbind_alt and _dl_audit_symbind Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 11/20] elf: Add _dl_audit_preinit Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 12/20] elf: Add _dl_audit_pltenter Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 13/20] elf: Add _dl_audit_pltexit Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 14/20] elf: Issue audit la_objopen() for vDSO Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 15/20] elf: Add main application on main_map l_name Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 16/20] elf: Add la_activity during application exit Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 17/20] elf: Issue la_symbind() for bind-now (BZ #23734) Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 18/20] elf: Add LA_SYMB_BINDNOW Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 19/20] elf: Move LAV_CURRENT to link_lavcurrent.h Adhemerval Zanella via Libc-alpha
2021-07-30 19:47 ` [PATCH v3 20/20] elf: Fix runtime linker auditing on aarch64 (BZ #26643) Adhemerval Zanella via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210730194715.881900-10-adhemerval.zanella@linaro.org \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
--cc=johnmc@rice.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).