From patchwork Wed Dec 22 13:26:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 49180 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 EAF183858412 for ; Wed, 22 Dec 2021 13:29:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAF183858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640179791; bh=wh/ljMMl7GQEJzCC5N2M3CaBjYhYhhnLLcYYNz0g1CI=; 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=XcgDnEutW4vZdgdb8wjsZ9FUcXfid3Rhj1MMIDSJ+11TOM09m+pe5B8Dv2hSYziQO sxfHPpyKzqrhdrji/3OElkUZhtuHuKsgctngidZsLflee3yk2jantZMPnkxaC1HzpT Yf8nDg+cmqtUPhIr1/7+DT5dchLt+0suLL15lIp0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by sourceware.org (Postfix) with ESMTPS id 9DFEC3858405 for ; Wed, 22 Dec 2021 13:27:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9DFEC3858405 Received: by mail-qt1-x829.google.com with SMTP id a1so1846759qtx.11 for ; Wed, 22 Dec 2021 05:27:21 -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=wh/ljMMl7GQEJzCC5N2M3CaBjYhYhhnLLcYYNz0g1CI=; b=PTFwNQxfyWW6x0poYxCMokXF2/7AGdClyayMUrmA4qExNm+2s9okKP297rqCaf6O0L iCVQ9ZkE5dSM37S+djBmWqBHQurBWFtPqtDcaIgEqyYur9Br13EgayQxRvK+ZQBO8gAg G5GckAx80OnRXy19VshMH63GyXTx04TmHTLRQxvvRbC4/00s46nbwnmHwGDYFG0uCoU7 GHoTI+VXgr7GLptXWlY568N2GaFkzZhHoe1gcKSEO6Ky9ePgUvwOE0Ycg4+nxInKYt3K fRT0IvDxpQqM4PkrSckB30vbzg6uU0f3KuTeWQYlkskfnbg+TrU7iS2erkSMdxqF7UkI KkKQ== X-Gm-Message-State: AOAM532kZNK0nQ6+ASAVnNdtnpY/AWnvQEmD1mffV2mDrTtwDM/VTIIW LKu5iGH8XXv6zdewb603Rq7+98B/jZN+Vw== X-Google-Smtp-Source: ABdhPJyiMN9a/m82+LTfRTDRIXY6KH5yjUJ+jbnmCZZpT5gtqAyl3CqeRnIxsALpExRssBODjs3cAQ== X-Received: by 2002:ac8:5654:: with SMTP id 20mr2054124qtt.652.1640179641049; Wed, 22 Dec 2021 05:27:21 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:27:20 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Subject: [PATCH v7 03/16] elf: Add _dl_audit_objsearch Date: Wed, 22 Dec 2021 10:26:59 -0300 Message-Id: <20211222132712.523295-4-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.4 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_objsearch audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer --- elf/dl-audit.c | 22 ++++++++++++ elf/dl-load.c | 69 +++++++++++--------------------------- sysdeps/generic/ldsodefs.h | 7 ++++ 3 files changed, 48 insertions(+), 50 deletions(-) diff --git a/elf/dl-audit.c b/elf/dl-audit.c index b44ecde135..522fc14db1 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -48,6 +48,28 @@ _dl_audit_activity_nsid (Lmid_t nsid, int action) _dl_audit_activity_map (head, action); } +const char * +_dl_audit_objsearch (const char *name, struct link_map *l, unsigned int code) +{ + if (l == NULL || l->l_auditing || code == 0) + return name; + + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + if (afct->objsearch != NULL) + { + struct auditstate *state = link_map_audit_state (l, cnt); + name = afct->objsearch (name, &state->cookie, code); + if (name == NULL) + return NULL; + } + afct = afct->next; + } + + return name; +} + void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) { diff --git a/elf/dl-load.c b/elf/dl-load.c index d1d02fa70e..cf15f85df6 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1602,32 +1602,20 @@ open_verify (const char *name, int fd, #ifdef SHARED /* Give the auditing libraries a chance. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0) && whatcode != 0 - && loader->l_auditing == 0) + if (__glibc_unlikely (GLRO(dl_naudit) > 0)) { const char *original_name = name; - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objsearch != NULL) - { - struct auditstate *state = link_map_audit_state (loader, cnt); - name = afct->objsearch (name, &state->cookie, whatcode); - if (name == NULL) - /* Ignore the path. */ - return -1; - } - - afct = afct->next; - } + name = _dl_audit_objsearch (name, loader, whatcode); + if (name == NULL) + return -1; - if (fd != -1 && name != original_name && strcmp (name, original_name)) - { - /* An audit library changed what we're supposed to open, - so FD no longer matches it. */ - __close_nocancel (fd); - fd = -1; - } + if (fd != -1 && name != original_name && strcmp (name, original_name)) + { + /* An audit library changed what we're supposed to open, + so FD no longer matches it. */ + __close_nocancel (fd); + fd = -1; + } } #endif @@ -2066,36 +2054,17 @@ _dl_map_object (struct link_map *loader, const char *name, #ifdef SHARED /* Give the auditing libraries a chance to change the name before we try anything. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0) - && (loader == NULL || loader->l_auditing == 0)) + if (__glibc_unlikely (GLRO(dl_naudit) > 0)) { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + const char *before = name; + name = _dl_audit_objsearch (name, loader, LA_SER_ORIG); + if (name == NULL) { - if (afct->objsearch != NULL) - { - const char *before = name; - struct auditstate *state = link_map_audit_state (loader, cnt); - name = afct->objsearch (name, &state->cookie, LA_SER_ORIG); - if (name == NULL) - { - /* Do not try anything further. */ - fd = -1; - goto no_file; - } - if (before != name && strcmp (before, name) != 0) - { - if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES)) - _dl_debug_printf ("audit changed filename %s -> %s\n", - before, name); - - if (origname == NULL) - origname = before; - } - } - - afct = afct->next; + fd = -1; + goto no_file; } + if (before != name && strcmp (before, name) != 0) + origname = before; } #endif diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e54efe65c8..f1c1281f4b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1396,6 +1396,13 @@ link_map_audit_state (struct link_map *l, size_t index) } } +/* Call the la_objsearch from the audit modules from the link map L. If + ORIGNAME is non NULL, it is updated with the revious name prior calling + la_objsearch. */ +const char *_dl_audit_objsearch (const char *name, struct link_map *l, + unsigned int code) + attribute_hidden; + /* 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)