From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 3FCBA3858414; Wed, 13 Oct 2021 19:27:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3FCBA3858414 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/ld-audit-fixes-v4] elf: Add _dl_audit_preinit X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/ld-audit-fixes-v4 X-Git-Oldrev: e23e69ded2c4c473227d47a9da728a7c3c63bff0 X-Git-Newrev: 962687087caeb4358c62741241769a4b39fa3394 Message-Id: <20211013192730.3FCBA3858414@sourceware.org> Date: Wed, 13 Oct 2021 19:27:30 +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: Wed, 13 Oct 2021 19:27:30 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=962687087caeb4358c62741241769a4b39fa3394 commit 962687087caeb4358c62741241769a4b39fa3394 Author: Adhemerval Zanella Date: Thu Jul 22 17:10:57 2021 -0300 elf: Add _dl_audit_preinit It consolidates the code required to call la_preinit() audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Diff: --- csu/libc-start.c | 23 +++-------------------- elf/Versions | 2 +- elf/dl-audit.c | 15 +++++++++++++++ sysdeps/generic/ldsodefs.h | 1 + 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index 0350b006fd..d01e57ea59 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -377,32 +377,15 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), /* This is a current program. Use the dynamic segment to find constructors. */ call_init (argc, argv, __environ); -#else /* !SHARED */ - call_init (argc, argv, __environ); -#endif /* SHARED */ -#ifdef SHARED /* Auditing checkpoint: we have a new object. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - struct link_map *head = GL(dl_ns)[LM_ID_BASE]._ns_loaded; - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->preinit != NULL) - afct->preinit (&link_map_audit_state (head, cnt)->cookie); - - afct = afct->next; - } - } -#endif + _dl_audit_preinit (GL(dl_ns)[LM_ID_BASE]._ns_loaded); -#ifdef SHARED if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]); -#endif +#else /* !SHARED */ + call_init (argc, argv, __environ); -#ifndef SHARED _dl_debug_initialize (0, LM_ID_BASE); #endif diff --git a/elf/Versions b/elf/Versions index 25e91339b5..bfe1aec293 100644 --- a/elf/Versions +++ b/elf/Versions @@ -55,7 +55,7 @@ ld { _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info; _dl_deallocate_tls; _dl_make_stack_executable; _dl_rtld_di_serinfo; _dl_starting_up; _dl_fatal_printf; - _dl_audit_symbind_alt; + _dl_audit_symbind_alt; _dl_audit_preinit; _rtld_global; _rtld_global_ro; # Only here for gdb while a better method is developed. diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 8e4c65fdaf..a968cbde16 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -122,6 +122,21 @@ _dl_audit_objclose (struct link_map *l, Lmid_t nsid) } } +void +_dl_audit_preinit (struct link_map *l) +{ + if (__glibc_likely (GLRO(dl_naudit) < 0)) + return; + + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + if (afct->preinit != NULL) + afct->preinit (&link_map_audit_state (l, cnt)->cookie); + afct = afct->next; + } +} + void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value, lookup_t result) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 8cca508080..c69c54200f 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1375,6 +1375,7 @@ void _dl_audit_activity_nsid (Lmid_t nsid, int action); if main mapping of the namespace is a audit modules. */ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit); void _dl_audit_objclose (struct link_map *l, Lmid_t nsid); +void _dl_audit_preinit (struct link_map *l); void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value, lookup_t result);