From patchwork Thu Oct 14 17:47:38 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: 46230 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 4DAAF3857C59 for ; Thu, 14 Oct 2021 17:53:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DAAF3857C59 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634234010; bh=i5t+1EEOFBf7bN0NjGbThKfg+d5FC6WIj3cs3oBcl9w=; 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=YPzEGIRkTz27UlPS/wFnGcfhEGaCw86JloLRfnMTXRAPqYC3Wli4hy6iT4oqfPfNc 94O158P9pzfVLM0fCWW354ZAumdNmnk8i6Sp3n0wVpV2HyzHlOa6Z6wdsDPKhrWGfm xFCheuJKxULFEdVgAgL06G8kCuldppY6zFJTpuyg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x929.google.com (mail-ua1-x929.google.com [IPv6:2607:f8b0:4864:20::929]) by sourceware.org (Postfix) with ESMTPS id C02BF3858020 for ; Thu, 14 Oct 2021 17:48:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C02BF3858020 Received: by mail-ua1-x929.google.com with SMTP id i15so13027994uap.0 for ; Thu, 14 Oct 2021 10:48:10 -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=i5t+1EEOFBf7bN0NjGbThKfg+d5FC6WIj3cs3oBcl9w=; b=C6k2ZtMkjm5Ba0pyUcBAQzj0cxXfohIVRGchwijZtzgHWWsM3BESG8aABfTYoaA4sC Z8eUKjEru3zMxv5UnySMV9IgpU3j1fb/ToIz7LQv+yzh8WpI1i6zdHuMgvchxw3HucpL MC2/+WFjNTrEtd8etWvLWhXKeRfDz2m5CvQ2BHn9Q3BxmDV/IwOJzujPBapydj51n/SC 0scJbEzQ4t1P9Os8AStVmMnpt0MQ2oThyxEFQi8oQYJb6xjq4tZA1lqyhDw0Y6YGjxwQ 9Ul9e1+znX7f8UL8q2AeY4qIRqRDWZj8AU9MjkAfd+D/KWzyo2eBdnfGOyRmw71GGl7+ 6DiA== X-Gm-Message-State: AOAM533Q4/v7kL/jMzKoCmlS98K+aCPg/+a6UteUAJ+oC4t8mjG7J3Hn sxWiN/uPaIJ08RtRcqUdacEROFVeIWSKvA== X-Google-Smtp-Source: ABdhPJxMkLFLTgLFXMx708fcc7ZrZzOOg+IqLAm/VYjB3sxrkC01bxWHfvymmKNmi86wWmfn5VctRQ== X-Received: by 2002:a9f:2f17:: with SMTP id x23mr8041314uaj.25.1634233690130; Thu, 14 Oct 2021 10:48:10 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 10:48:09 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v4 07/21] elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid Date: Thu, 14 Oct 2021 14:47:38 -0300 Message-Id: <20211014174752.1651347-8-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.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 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_activity() audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. --- elf/dl-audit.c | 23 ++++++++++++++++ elf/dl-close.c | 54 +++++++------------------------------- elf/dl-load.c | 28 +++++--------------- elf/dl-open.c | 20 +------------- elf/rtld.c | 31 ++-------------------- sysdeps/generic/ldsodefs.h | 7 +++++ 6 files changed, 48 insertions(+), 115 deletions(-) diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 24d8557f18..5fbc76a36c 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -19,6 +19,29 @@ #include #ifdef SHARED +void +_dl_audit_activity_map (struct link_map *l, int action) +{ + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + if (afct->activity != NULL) + afct->activity (&link_map_audit_state (l, cnt)->cookie, action); + afct = afct->next; + } +} + +void +_dl_audit_activity_nsid (Lmid_t nsid, int action) +{ + struct link_map *head = GL(dl_ns)[nsid]._ns_loaded; + if (__glibc_likely (GLRO(dl_naudit) == 0) + || head == NULL || head->l_auditing) + return; + + _dl_audit_activity_map (head, action); +} + void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit) { diff --git a/elf/dl-close.c b/elf/dl-close.c index cfe0f1c0c9..6fadf38f7f 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -478,25 +478,7 @@ _dl_close_worker (struct link_map *map, bool force) #ifdef SHARED /* Auditing checkpoint: we will start deleting objects. */ - if (__glibc_unlikely (do_audit)) - { - struct link_map *head = ns->_ns_loaded; - struct audit_ifaces *afct = GLRO(dl_audit); - /* Do not call the functions for any auditing object. */ - if (head->l_auditing == 0) - { - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - { - struct auditstate *state = link_map_audit_state (head, cnt); - afct->activity (&state->cookie, LA_ACT_DELETE); - } - - afct = afct->next; - } - } - } + _dl_audit_activity_nsid (nsid, LA_ACT_DELETE); #endif /* Notify the debugger we are about to remove some loaded objects. */ @@ -791,32 +773,14 @@ _dl_close_worker (struct link_map *map, bool force) __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); #ifdef SHARED - /* Auditing checkpoint: we have deleted all objects. */ - if (__glibc_unlikely (do_audit)) - { - struct link_map *head = ns->_ns_loaded; - /* If head is NULL, the namespace has become empty, and the - audit interface does not give us a way to signal - LA_ACT_CONSISTENT for it because the first loaded module is - used to identify the namespace. - - Furthermore, do not notify auditors of the cleanup of a - failed audit module loading attempt. */ - if (head != NULL && head->l_auditing == 0) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - { - struct auditstate *state = link_map_audit_state (head, cnt); - afct->activity (&state->cookie, LA_ACT_CONSISTENT); - } - - afct = afct->next; - } - } - } + /* Auditing checkpoint: we have deleted all objects. If head is NULL, the + namespace has become empty, and the audit interface does not give us a + way to signal LA_ACT_CONSISTENT for it because the first loaded module + is used to identify the namespace. + + Furthermore, do not notify auditors of the cleanup of a failed audit + module loading attempt. */ + _dl_audit_activity_nsid (nsid, LA_ACT_CONSISTENT); #endif if (__builtin_expect (ns->_ns_loaded == NULL, 0) diff --git a/elf/dl-load.c b/elf/dl-load.c index b5f88e1723..dad7654f94 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1062,28 +1062,12 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, if (r->r_state == RT_CONSISTENT) { #ifdef SHARED - /* Auditing checkpoint: we are going to add new objects. */ - if ((mode & __RTLD_AUDIT) == 0 - && __glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct link_map *head = GL(dl_ns)[nsid]._ns_loaded; - /* Do not call the functions for any auditing object and also do not - try to call auditing functions if the namespace is currently - empty. This happens when opening the first DSO in a new - namespace. */ - if (head != NULL && head->l_auditing == 0) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - afct->activity (&link_map_audit_state (head, cnt)->cookie, - LA_ACT_ADD); - - afct = afct->next; - } - } - } + /* Auditing checkpoint: we are going to add new objects. Do not call + the functions for any auditing object and also do not try to call + auditing functions if the namespace is currently empty. This + happens when opening the first DSO in a new namespace. */ + if ((mode & __RTLD_AUDIT) == 0) + _dl_audit_activity_nsid (nsid, LA_ACT_ADD); #endif /* Notify the debugger we have added some objects. We need to diff --git a/elf/dl-open.c b/elf/dl-open.c index 00f6d8cfcc..4f4d72e325 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -611,25 +611,7 @@ dl_open_worker_begin (void *a) #ifdef SHARED /* Auditing checkpoint: we have added all objects. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct link_map *head = GL(dl_ns)[new->l_ns]._ns_loaded; - /* Do not call the functions for any auditing object. */ - if (head->l_auditing == 0) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - { - struct auditstate *state = link_map_audit_state (head, cnt); - afct->activity (&state->cookie, LA_ACT_CONSISTENT); - } - - afct = afct->next; - } - } - } + _dl_audit_activity_nsid (new->l_ns, LA_ACT_CONSISTENT); #endif /* Notify the debugger all new objects are now ready to go. */ diff --git a/elf/rtld.c b/elf/rtld.c index b327097405..13bb1ba4cd 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1751,18 +1751,7 @@ dl_main (const ElfW(Phdr) *phdr, /* Auditing checkpoint: we are ready to signal that the initial map is being constructed. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - afct->activity (&link_map_audit_state (main_map, cnt)->cookie, - LA_ACT_ADD); - - afct = afct->next; - } - } + _dl_audit_activity_map (main_map, LA_ACT_ADD); /* We have two ways to specify objects to preload: via environment variable and via the file /etc/ld.so.preload. The latter can also @@ -2443,23 +2432,7 @@ dl_main (const ElfW(Phdr) *phdr, #ifdef SHARED /* Auditing checkpoint: we have added all objects. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct link_map *head = GL(dl_ns)[LM_ID_BASE]._ns_loaded; - /* Do not call the functions for any auditing object. */ - if (head->l_auditing == 0) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->activity != NULL) - afct->activity (&link_map_audit_state (head, cnt)->cookie, - LA_ACT_CONSISTENT); - - afct = afct->next; - } - } - } + _dl_audit_activity_nsid (LM_ID_BASE, LA_ACT_CONSISTENT); #endif /* Notify the debugger all new objects are now ready to go. We must re-get diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 12f6346328..1237d1a38b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1361,6 +1361,13 @@ link_map_audit_state (struct link_map *l, size_t index) } } +/* Call the la_activity() from the audit modules from the link map L + and issues the ACTION argument. */ +void _dl_audit_activity_map (struct link_map *l, int action) + attribute_hidden; +/* Call the la_activity() from the audit modules from the link map + from the namespace NSSID and issues the ACTION argument. */ +void _dl_audit_activity_nsid (Lmid_t nsid, int action); /* 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. */