From patchwork Wed Dec 22 13:26:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 49178 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 69B573858426 for ; Wed, 22 Dec 2021 13:28:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69B573858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640179701; bh=ZcW9u3HBr5Ksv0ThxIMhkYqMSES/HHhjZgGYxmyYPn8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=w5SNjkPCxGgLMFtYsBxkyvOkr+DM0CwVU0DIjTtLLwhTfghonIiWiRMR4ZEcxftCO vTXhU7RKcSIVoSY302zxf+bJPoXSfW1MzQTtrM6UB1fRdhh/etx5oD+mTXouQ9yBw+ TwoqPLZi0OOOZg4PHzL3FtUpeJFMQM1EP2b7pQ68= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by sourceware.org (Postfix) with ESMTPS id 9E9823858C2C for ; Wed, 22 Dec 2021 13:27:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9E9823858C2C Received: by mail-qv1-xf30.google.com with SMTP id a9so2255775qvd.12 for ; Wed, 22 Dec 2021 05:27:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZcW9u3HBr5Ksv0ThxIMhkYqMSES/HHhjZgGYxmyYPn8=; b=P/C1c54pTF59IVJtqgwzt7qz9DflrL4dBPHBDmpq5g94gyjtucxnEA5YjU33Tjqvw0 UeuQO5WP3CJkQiP0W7B9gDh/yjYd2lbEFJTkrK60ZH0BGhRSeDepoMfdGgWJQ5DHDS5f Oyhb+Yl1JQSDnVLPFdLDYqHK9eqB8q1LVg/IA+cyI7yABibYNwli5m3FtqL6CWkxAbhR 8fHGKJKHgV+lGge0B9t6+0flS4Uj6tfH+pZj2owTbg231dONkEwdGzAFNzgMswgIw+p6 egAjD/R1Z/VHFm+aORJh954jHSkUNgtJw6VRz2XaAQSqJIk41b0xURVgwJqVThwp2qMl 4Mmw== X-Gm-Message-State: AOAM531owmYCSbb/UZ2Wyd4/KLG5gyrACET0nmbUinoV/EWC1cKhDLon CkeR6YXscqAxT3aUvqO/oDYOijD0r2Zntw== X-Google-Smtp-Source: ABdhPJz4ZV1maVZx+paePd/jmon44CS5rHSrpD9YTkIMabDJtEXXMdgIIcyNPX/1nLdz/0cKbmaDNQ== X-Received: by 2002:a05:6214:21a6:: with SMTP id t6mr2359213qvc.24.1640179638000; Wed, 22 Dec 2021 05:27:18 -0800 (PST) Received: from birita.. ([2804:431:c7cb:3b1e:1ba8:c11f:6224:efe1]) by smtp.gmail.com with ESMTPSA id x13sm1942849qkp.102.2021.12.22.05.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:27:17 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Subject: [PATCH v7 01/16] elf: Add _dl_audit_objopen Date: Wed, 22 Dec 2021 10:26:57 -0300 Message-Id: <20211222132712.523295-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211222132712.523295-1-adhemerval.zanella@linaro.org> References: <20211222132712.523295-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: John Mellor-Crummey Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It consolidates the code required to call la_objopen audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer --- elf/Makefile | 2 +- elf/dl-audit.c | 39 ++++++++++++++++++++++++++++++++++++++ elf/dl-load.c | 18 ++---------------- elf/rtld.c | 23 ++-------------------- sysdeps/generic/ldsodefs.h | 5 +++++ 5 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 elf/dl-audit.c diff --git a/elf/Makefile b/elf/Makefile index fe42caeb0e..5e4ffeb530 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -68,7 +68,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \ rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \ dl-error-minimal dl-conflict dl-hwcaps dl-hwcaps_split dl-hwcaps-subdirs \ dl-usage dl-diagnostics dl-diagnostics-kernel dl-diagnostics-cpu \ - dl-mutex dl-libc_freeres + dl-mutex dl-libc_freeres dl-audit all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables diff --git a/elf/dl-audit.c b/elf/dl-audit.c new file mode 100644 index 0000000000..4066dfe851 --- /dev/null +++ b/elf/dl-audit.c @@ -0,0 +1,39 @@ +/* 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 + +void +_dl_audit_objopen (struct link_map *l, Lmid_t nsid) +{ + 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->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; + } +} diff --git a/elf/dl-load.c b/elf/dl-load.c index 721593135e..57de24491a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1521,22 +1521,8 @@ 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; - } - } + if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) + _dl_audit_objopen (l, nsid); #endif return l; diff --git a/elf/rtld.c b/elf/rtld.c index 4b09e84b0d..6b8316e8a9 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1065,25 +1065,6 @@ ERROR: audit interface '%s' requires version %d (maximum supported version %d); dlmargs.map->l_auditing = 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) @@ -1102,8 +1083,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); + _dl_audit_objopen (&GL(dl_rtld_map), LM_ID_BASE); } } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index c26860430c..c38a89f3d0 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1395,6 +1395,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. */ +void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) + attribute_hidden; #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED