From patchwork Wed Dec 22 13:27:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 49181 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 F1FC9385841F for ; Wed, 22 Dec 2021 13:30:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1FC9385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640179833; bh=KZJwPyvp8q4DMQciQLHR7khHh1Nryx593TVWG4228bc=; 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=Am2O3hwTUyceF+nVy6yLQUpdgCQr7JYXDnI9z97UkXISKyCBeghWQR/9z9snWKcji LAHPfWuNuYACHgCLP6cNKpIz6GeGKlG4rfeZirze8IqOvMDY3Lib2gUWDuhcM6Jjwx d7LAWtX8MPotaIvAEKBkmw23/UQ/dajvLVg9zaSs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id 11DB73858405 for ; Wed, 22 Dec 2021 13:27:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 11DB73858405 Received: by mail-qt1-x833.google.com with SMTP id m25so1838999qtq.13 for ; Wed, 22 Dec 2021 05:27:23 -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=KZJwPyvp8q4DMQciQLHR7khHh1Nryx593TVWG4228bc=; b=0fLN5cYRPTaNcun7qypv7ATj1xAxNyc/86KQ5ZDSyf1V0eY0GDvRRMz0bhM4icrwXt VGGj9MsYUAkH/w6T5Xw18UzsQtDlgseBgRewqCLbLYKIL0SC3TXImJKEaZ7wYlRv4hxI TSwDXL/ujkqkdM5mcEnUJIEKKeFx/4ePg/mFS+QOBCa/1UZOYkSlYzUr0aQGY6k9pHtv zKAgNM9hKDHmOaGoIrM7BHLgwmeS7N1x1jW/jsCXJOwLpCOADrkD+TRaLhHUZ0ysX2Nw iF8Va7cQYY2Up8henLsCCS8LuHfvR1Ll41G2STr7+Ebn5VgiNo8ekJX2D23+EbZAy7DT MgMg== X-Gm-Message-State: AOAM532E8sZ+f54WV03b1+5QVMPC3nk94mlG/Vdg5dtOO2aiEUU4d6PS IayMiWtBm4ZaV1OgqkdPXrpooJVgxlcr7A== X-Google-Smtp-Source: ABdhPJzG9U53F0foM21mgDQDs8r9Jx/DtFJ1BuXXMrV0ChQZADnr0Otzxz0wkKwzdTJpTJAtnMMhQQ== X-Received: by 2002:ac8:7c45:: with SMTP id o5mr2066014qtv.0.1640179642515; Wed, 22 Dec 2021 05:27:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:27:22 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Subject: [PATCH v7 04/16] elf: Add _dl_audit_objclose Date: Wed, 22 Dec 2021 10:27:00 -0300 Message-Id: <20211222132712.523295-5-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.5 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 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. Reviewed-by: Florian Weimer --- elf/dl-audit.c | 21 +++++++++++++++++++++ elf/dl-close.c | 20 +------------------- elf/dl-fini.c | 16 +--------------- sysdeps/generic/ldsodefs.h | 4 ++++ 4 files changed, 27 insertions(+), 34 deletions(-) diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 522fc14db1..ff04592417 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -89,3 +89,24 @@ _dl_audit_objopen (struct link_map *l, Lmid_t nsid) afct = afct->next; } } + +void +_dl_audit_objclose (struct link_map *l) +{ + 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; + } +} diff --git a/elf/dl-close.c b/elf/dl-close.c index b9a610981f..87993426b5 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); #endif /* This object must not be used anymore. */ diff --git a/elf/dl-fini.c b/elf/dl-fini.c index c683884c35..b789cfb9f2 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); #endif } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index f1c1281f4b..14ae41c535 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1417,6 +1417,10 @@ void _dl_audit_activity_nsid (Lmid_t nsid, int action) namespace identification NSID. */ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) attribute_hidden; + +/* Call the la_objclose from the audit modules for the link_map L. */ +void _dl_audit_objclose (struct link_map *l) + attribute_hidden; #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED