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 12/20] elf: Add _dl_audit_pltenter
Date: Fri, 30 Jul 2021 16:47:07 -0300 [thread overview]
Message-ID: <20210730194715.881900-13-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20210730194715.881900-1-adhemerval.zanella@linaro.org>
It consolidates the code required to call la_pltenter() audit
callback.
No function change, checked on x86_64-linux-gnu.
---
elf/dl-audit.c | 77 ++++++++++++++++++++++++++++++++++++++
elf/dl-runtime.c | 73 +-----------------------------------
sysdeps/generic/ldsodefs.h | 8 ++++
3 files changed, 86 insertions(+), 72 deletions(-)
diff --git a/elf/dl-audit.c b/elf/dl-audit.c
index a968cbde16..7d410bc128 100644
--- a/elf/dl-audit.c
+++ b/elf/dl-audit.c
@@ -17,7 +17,9 @@
<https://www.gnu.org/licenses/>. */
#include <assert.h>
+#include <link.h>
#include <ldsodefs.h>
+#include <dl-machine.h>
#ifdef SHARED
void
@@ -257,4 +259,79 @@ _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result,
reloc_result->flags = flags;
*value = DL_FIXUP_ADDR_VALUE (sym.st_value);
}
+
+void
+_dl_audit_pltenter (struct link_map *l, struct reloc_result *reloc_result,
+ DL_FIXUP_VALUE_TYPE *value, void *regs, long int *framesize)
+{
+ /* Don't do anything if no auditor wants to intercept this call. */
+ if (GLRO(dl_naudit) == 0
+ || (reloc_result->enterexit & LA_SYMB_NOPLTENTER))
+ return;
+
+ /* Sanity check: DL_FIXUP_VALUE_CODE_ADDR (value) should have been
+ initialized earlier in this function or in another thread. */
+ assert (DL_FIXUP_VALUE_CODE_ADDR (*value) != 0);
+ ElfW(Sym) *defsym = ((ElfW(Sym) *) D_PTR (reloc_result->bound,
+ l_info[DT_SYMTAB])
+ + reloc_result->boundndx);
+
+ /* Set up the sym parameter. */
+ ElfW(Sym) sym = *defsym;
+ sym.st_value = DL_FIXUP_VALUE_ADDR (*value);
+
+ /* Get the symbol name. */
+ const char *strtab = (const void *) D_PTR (reloc_result->bound,
+ l_info[DT_STRTAB]);
+ const char *symname = strtab + sym.st_name;
+
+ /* Keep track of overwritten addresses. */
+ unsigned int flags = reloc_result->flags;
+
+ struct audit_ifaces *afct = GLRO(dl_audit);
+ for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
+ {
+ if (afct->ARCH_LA_PLTENTER != NULL
+ && (reloc_result->enterexit
+ & (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0)
+ {
+ long int new_framesize = -1;
+ struct auditstate *l_state = link_map_audit_state (l, cnt);
+ struct auditstate *bound_state
+ = link_map_audit_state (reloc_result->bound, cnt);
+ uintptr_t new_value
+ = afct->ARCH_LA_PLTENTER (&sym, reloc_result->boundndx,
+ &l_state->cookie, &bound_state->cookie,
+ regs, &flags, symname, &new_framesize);
+ if (new_value != (uintptr_t) sym.st_value)
+ {
+ flags |= LA_SYMB_ALTVALUE;
+ sym.st_value = new_value;
+ }
+
+ /* Remember the results for every audit library and store a summary
+ in the first two bits. */
+ reloc_result->enterexit |= ((flags & (LA_SYMB_NOPLTENTER
+ | LA_SYMB_NOPLTEXIT))
+ << (2 * (cnt + 1)));
+
+ if ((reloc_result->enterexit & (LA_SYMB_NOPLTEXIT
+ << (2 * (cnt + 1))))
+ == 0 && new_framesize != -1 && *framesize != -2)
+ {
+ /* If this is the first call providing information, use it. */
+ if (*framesize == -1)
+ *framesize = new_framesize;
+ /* If two pltenter calls provide conflicting information, use
+ the larger value. */
+ else if (new_framesize != *framesize)
+ *framesize = MAX (new_framesize, *framesize);
+ }
+ }
+
+ afct = afct->next;
+ }
+
+ *value = DL_FIXUP_ADDR_VALUE (sym.st_value);
+}
#endif
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 680e66a6d6..4d16957c08 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -351,78 +351,7 @@ _dl_profile_fixup (
#ifdef SHARED
/* Auditing checkpoint: report the PLT entering and allow the
auditors to change the value. */
- if (GLRO(dl_naudit) > 0
- /* Don't do anything if no auditor wants to intercept this call. */
- && (reloc_result->enterexit & LA_SYMB_NOPLTENTER) == 0)
- {
- /* Sanity check: DL_FIXUP_VALUE_CODE_ADDR (value) should have been
- initialized earlier in this function or in another thread. */
- assert (DL_FIXUP_VALUE_CODE_ADDR (value) != 0);
- ElfW(Sym) *defsym = ((ElfW(Sym) *) D_PTR (reloc_result->bound,
- l_info[DT_SYMTAB])
- + reloc_result->boundndx);
-
- /* Set up the sym parameter. */
- ElfW(Sym) sym = *defsym;
- sym.st_value = DL_FIXUP_VALUE_ADDR (value);
-
- /* Get the symbol name. */
- const char *strtab = (const void *) D_PTR (reloc_result->bound,
- l_info[DT_STRTAB]);
- const char *symname = strtab + sym.st_name;
-
- /* Keep track of overwritten addresses. */
- unsigned int flags = reloc_result->flags;
-
- struct audit_ifaces *afct = GLRO(dl_audit);
- for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
- {
- if (afct->ARCH_LA_PLTENTER != NULL
- && (reloc_result->enterexit
- & (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0)
- {
- long int new_framesize = -1;
- struct auditstate *l_state = link_map_audit_state (l, cnt);
- struct auditstate *bound_state
- = link_map_audit_state (reloc_result->bound, cnt);
- uintptr_t new_value
- = afct->ARCH_LA_PLTENTER (&sym, reloc_result->boundndx,
- &l_state->cookie,
- &bound_state->cookie,
- regs, &flags, symname,
- &new_framesize);
- if (new_value != (uintptr_t) sym.st_value)
- {
- flags |= LA_SYMB_ALTVALUE;
- sym.st_value = new_value;
- }
-
- /* Remember the results for every audit library and
- store a summary in the first two bits. */
- reloc_result->enterexit
- |= ((flags & (LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT))
- << (2 * (cnt + 1)));
-
- if ((reloc_result->enterexit & (LA_SYMB_NOPLTEXIT
- << (2 * (cnt + 1))))
- == 0 && new_framesize != -1 && framesize != -2)
- {
- /* If this is the first call providing information,
- use it. */
- if (framesize == -1)
- framesize = new_framesize;
- /* If two pltenter calls provide conflicting information,
- use the larger value. */
- else if (new_framesize != framesize)
- framesize = MAX (new_framesize, framesize);
- }
- }
-
- afct = afct->next;
- }
-
- value = DL_FIXUP_ADDR_VALUE (sym.st_value);
- }
+ _dl_audit_pltenter (l, reloc_result, &value, regs, &framesize);
#endif
/* Store the frame size information. */
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 4d39888a7b..32a621ae99 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1379,6 +1379,14 @@ void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref,
/* Call the la_preinit() from audit modules for the link_map L. */
void _dl_audit_preinit (struct link_map *l);
rtld_hidden_proto (_dl_audit_symbind_alt)
+/* Call the la_pltenter() arch specific from audit modules for the link_map L.
+ The RELOC_RESULT is the entry from link_map::l_reloc_result used to keep
+ track of the binding actions set by the audit modules, while VALUE is the
+ relocation result value, and REGS is the arch-specific register state
+ saved, and FRAMESIZE is the frame size pointer passed on the callback. */
+void _dl_audit_pltenter (struct link_map *l, struct reloc_result *reloc_result,
+ DL_FIXUP_VALUE_TYPE *value, void *regs,
+ long int *framesize);
#endif /* SHARED */
#if PTHREAD_IN_LIBC && defined SHARED
--
2.30.2
next prev parent reply other threads:[~2021-07-30 19:57 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 ` [PATCH v3 09/20] elf: Add _dl_audit_objclose Adhemerval Zanella via Libc-alpha
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 ` Adhemerval Zanella via Libc-alpha [this message]
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-13-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).