From patchwork Tue Nov 9 18:33:34 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: 47307 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 0E5223858012 for ; Tue, 9 Nov 2021 18:40:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E5223858012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636483253; bh=BlfIWmP9uFkKprMvnLNh46G6/Nk5ispu6Jff6q0zn2g=; 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=RAvSKxxQP5k5AOLIHWzVy6xaiTP9qYeYTSTJpQM2xPu6s41A3gnfkXFahrZdnxKnS K3z4yqPsQ0qD9u6xm11Z/vRWvfDU795jvf8mV4CHPn/BVfKCKxW3CPcMyhWY7YwwhP I3WSz3/5TxtJ/DCKvdGSWrvaN+I4QWvRdMr2EiNI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id EB79C385841B for ; Tue, 9 Nov 2021 18:34:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB79C385841B Received: by mail-pg1-x52a.google.com with SMTP id r28so19275934pga.0 for ; Tue, 09 Nov 2021 10:34:12 -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=BlfIWmP9uFkKprMvnLNh46G6/Nk5ispu6Jff6q0zn2g=; b=M9X07xMbvN8i4464vvJOFzD5vvKhx81B8ipYIFUYh+C6JuwiIkoM+X52fpdN95rJ9a FG+q0MGSbSh6lgb+lK1R637pC9BjG3TTjkySfVX/1j7Nzx8heeKDx12IQw6TopzWUhkD a9SSOSuSHd1i1scW4J3KYA6mH2dVTUd/jOd8+X9r9olKqo+xwvOL8UnKTF6IBtYTVRYh fYUIV9RjIQPokOIz94OpQPkQO4XyTWzEXxPFUSHPp5A5P3CZHgVEVk8WLm6fzM9xH6xZ jANa8EHyd4fnA1m51e2nblem9Y5vlgg53ambwnlciI2eVMOFZTtVs6jMm9oxF9QoNwuR uTpw== X-Gm-Message-State: AOAM532r5XvonE6xsULFs7r0oPj6Hyc3MYiPhU31IPKZUDMY0riR2S8B x+yvXUMiybtVdjfCNZIJw5eJGD+CzP7DLA== X-Google-Smtp-Source: ABdhPJyKENOMfoHq2ynud3F6AGfzzvyTaoYDE/7Ke/HptjeoxPK0OZNvgO6FPPD5hHhuyKU9y3dtEA== X-Received: by 2002:a63:371b:: with SMTP id e27mr7371756pga.94.1636482851861; Tue, 09 Nov 2021 10:34:11 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:94d0:2630:9b29:e621]) by smtp.gmail.com with ESMTPSA id ep15sm3761884pjb.3.2021.11.09.10.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 10:34:11 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v5 09/22] elf: Add _dl_audit_objclose Date: Tue, 9 Nov 2021 15:33:34 -0300 Message-Id: <20211109183347.2943786-10-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211109183347.2943786-1-adhemerval.zanella@linaro.org> References: <20211109183347.2943786-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 79dbb41094..df4e948498 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -260,9 +260,6 @@ _dl_close_worker (struct link_map *map, bool force) _dl_sort_maps (maps, nloaded, (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; @@ -296,22 +293,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 c683884c35..1720cfaeb8 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -146,21 +146,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 b1c76361d2..82dbc66d79 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1405,6 +1405,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