From patchwork Thu Oct 14 17:47:40 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: 46232 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 4F9083857C51 for ; Thu, 14 Oct 2021 17:54:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F9083857C51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634234094; bh=7PNRPlsQ0+U2r9jZzd7Bg0GC4/FNXvSWiUKNydSXMZ4=; 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=LANRj52BPmIPqUDnQxRerVVm2xhOMQ3bweWtUpaghLj8GymGX7T21Qh5CTtNsmmPg JDqHIAsb4fl0Cy19tLdmhU8HfrCagtTppUpAOsTNRG1eyyQvd+vFASoR+gbC1HFjOh qxPTPFK1YNBOGXGgHWFWjZdpV+CRI8mIeDrtKRAY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x936.google.com (mail-ua1-x936.google.com [IPv6:2607:f8b0:4864:20::936]) by sourceware.org (Postfix) with ESMTPS id 74DD73858025 for ; Thu, 14 Oct 2021 17:48:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 74DD73858025 Received: by mail-ua1-x936.google.com with SMTP id e2so12891301uax.7 for ; Thu, 14 Oct 2021 10:48:13 -0700 (PDT) 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=7PNRPlsQ0+U2r9jZzd7Bg0GC4/FNXvSWiUKNydSXMZ4=; b=cWA8sp+32XrBVHjS+wbGKAv18OdEYgiW6S2mYteGeApRF9ThjszIPRAT5lrHvYKKjn OJ9GtRYMiEOwGgJkXpl5EE7Z7kdUq4WKH3pneCURUkvWG2jWCaVRqt5q6Qbe9vBtwyPz y+h1FvNofJ+/N77aiq6NQ239NDwxS6afhXkoYk5aYI2a7p9HaOFlR5R6aSlKWh4PqfsW 3OKMqMdVrp5KTFiIPQ9qwSc3yZgrrncKN4R/H3BU63nymVN8MnifbPUGPWiT8HksRV1z PDQ/BmJcCjo7nyC++v1bZTUWkNEtHTS58C0AkpWSLEmcGyEDpmUkCpsevk8sy1AjzRUi JiUQ== X-Gm-Message-State: AOAM530iJ9dRNBd0BpXjThKcmIyPQI5r3oZLIo+713xeo6JXIxH5Z+pw lcAIsggwwp7g2zeW5mQQJwj334oJNdEMKg== X-Google-Smtp-Source: ABdhPJzFZef4y1lfC2BeQdIuwD2AsL7isMelvG98Wi/3YqQN3BuTg++HjTZS8T9Xt9Z+uhGcegISwQ== X-Received: by 2002:ab0:3a82:: with SMTP id r2mr7897450uaw.101.1634233692940; Thu, 14 Oct 2021 10:48:12 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:c6c7:3c65:db0e:6fcc:a8e9]) by smtp.gmail.com with ESMTPSA id q26sm2107237vkn.40.2021.10.14.10.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 10:48:12 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v4 09/21] elf: Add _dl_audit_objclose Date: Thu, 14 Oct 2021 14:47:40 -0300 Message-Id: <20211014174752.1651347-10-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211014174752.1651347-1-adhemerval.zanella@linaro.org> References: <20211014174752.1651347-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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_objclose() audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. --- elf/dl-audit.c | 21 +++++++++++++++++++++ elf/dl-close.c | 20 +------------------- elf/dl-fini.c | 16 +--------------- sysdeps/generic/ldsodefs.h | 1 + 4 files changed, 24 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 6fadf38f7f..cc2c39e927 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 17378339e7..37ec6fa2c5 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1374,6 +1374,7 @@ 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 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); #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED