From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id DE96D3969836; Wed, 4 Aug 2021 20:53:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE96D3969836 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] elf: Add _dl_audit_objopen X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/ld-audit-fixes X-Git-Oldrev: f572c91a4060d04b38f5fab814685e4bc3876186 X-Git-Newrev: a3503e54dd624d6481c7e81c2d507aeea69973d4 Message-Id: <20210804205308.DE96D3969836@sourceware.org> Date: Wed, 4 Aug 2021 20:53:08 +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, 04 Aug 2021 20:53:09 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a3503e54dd624d6481c7e81c2d507aeea69973d4 commit a3503e54dd624d6481c7e81c2d507aeea69973d4 Author: Adhemerval Zanella Date: Mon Jul 19 15:47:51 2021 -0300 elf: Add _dl_audit_objopen It consolidates the code required to call la_objopen() audit callback. Diff: --- elf/Makefile | 3 ++- elf/dl-audit.c | 42 ++++++++++++++++++++++++++++++++++++++++++ elf/dl-load.c | 17 +---------------- elf/rtld.c | 23 ++--------------------- sysdeps/generic/ldsodefs.h | 5 +++++ 5 files changed, 52 insertions(+), 38 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 78ab9f2228..c6c97efd8c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -35,7 +35,8 @@ dl-routines = $(addprefix dl-,load lookup object reloc deps \ execstack open close trampoline \ exception sort-maps lookup-direct \ call-libc-early-init write \ - thread_gscope_wait tls_init_tp) + thread_gscope_wait tls_init_tp \ + audit) ifeq (yes,$(use-ldconfig)) dl-routines += dl-cache endif diff --git a/elf/dl-audit.c b/elf/dl-audit.c new file mode 100644 index 0000000000..24d8557f18 --- /dev/null +++ b/elf/dl-audit.c @@ -0,0 +1,42 @@ +/* Audit common functions. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#ifdef SHARED +void +_dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit) +{ + if (__glibc_likely (GLRO(dl_naudit) == 0) + || (check_audit && 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->objopen != NULL) + { + struct auditstate *state = link_map_audit_state (l, cnt); + state->bindflags = afct->objopen (l, nsid, &state->cookie); + l->l_audit_any_plt |= state->bindflags != 0; + } + + afct = afct->next; + } +} +#endif diff --git a/elf/dl-load.c b/elf/dl-load.c index 433a59191a..c0b68638c0 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1512,22 +1512,7 @@ cannot enable executable stack as shared object requires"); #ifdef SHARED /* Auditing checkpoint: we have a new object. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0) - && !GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objopen != NULL) - { - struct auditstate *state = link_map_audit_state (l, cnt); - state->bindflags = afct->objopen (l, nsid, &state->cookie); - l->l_audit_any_plt |= state->bindflags != 0; - } - - afct = afct->next; - } - } + _dl_audit_objopen (l, nsid, true); #endif return l; diff --git a/elf/rtld.c b/elf/rtld.c index 1312378b5f..8008570f82 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1057,25 +1057,6 @@ ERROR: audit interface '%s' requires version %d (maximum supported version %d); dlmargs.map->l_dont_set_tls_static = 1; } -/* Notify the the audit modules that the object MAP has already been - loaded. */ -static void -notify_audit_modules_of_loaded_object (struct link_map *map) -{ - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objopen != NULL) - { - struct auditstate *state = link_map_audit_state (map, cnt); - state->bindflags = afct->objopen (map, LM_ID_BASE, &state->cookie); - map->l_audit_any_plt |= state->bindflags != 0; - } - - afct = afct->next; - } -} - /* Load all audit modules. */ static void load_audit_modules (struct link_map *main_map, struct audit_list *audit_list) @@ -1094,8 +1075,8 @@ load_audit_modules (struct link_map *main_map, struct audit_list *audit_list) program and the dynamic linker itself). */ if (GLRO(dl_naudit) > 0) { - notify_audit_modules_of_loaded_object (main_map); - notify_audit_modules_of_loaded_object (&GL(dl_rtld_map)); + _dl_audit_objopen (main_map, LM_ID_BASE, false); + _dl_audit_objopen (&GL(dl_rtld_map), LM_ID_BASE, false); } } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9c15259236..7eb3ad8ff9 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1346,6 +1346,11 @@ link_map_audit_state (struct link_map *l, size_t index) return &base[index]; } } + +/* Call the la_objopen() from the audit modules for the link_map L on the + namespace identification NSID. If CHECK_AUDIT is set it will also check + if main mapping of the namespace is a audit modules. */ +void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit); #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED