From patchwork Mon Nov 15 18:37:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 47699 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 7EEA53858027 for ; Mon, 15 Nov 2021 18:39:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EEA53858027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637001572; bh=pwDJpe84owM+zWuuczRR3fHapXnpzLXffywlytzQSaw=; 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=HbRrtH+OV6azlObB31Eyv50mXxh0sPXBrNaxx/PsaknXikvljbRToJRoDxWCkfoZJ B+rWdpRxDLvG8irABbvZXhn1IQpEYII+fKQrMIy7torxNfGBVKQZg06lsP/5T1Z+xV o5S4rXYrUFLz+ey7ekMXLewpjBJcZfouE4SHdbZ8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa34.google.com (mail-vk1-xa34.google.com [IPv6:2607:f8b0:4864:20::a34]) by sourceware.org (Postfix) with ESMTPS id 02B8D3858405 for ; Mon, 15 Nov 2021 18:37:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 02B8D3858405 Received: by mail-vk1-xa34.google.com with SMTP id d130so9710362vke.0 for ; Mon, 15 Nov 2021 10:37:42 -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=pwDJpe84owM+zWuuczRR3fHapXnpzLXffywlytzQSaw=; b=ZYNcjPNhZrWxMuzRx8hMmVZc86tNkJlzm21V+zN26b5GCW2LAeHnIcWR6/vh2nYVIN +80TDmQjBZx2k3wOo/ZIc01nimZ50DxdKvKKdXPUHcHaI8lAmtjMJboUiYoJ5OJizJ7c bnfLh6xJ4wjZIftH8ngpS4ZlJpQgRL6Lazd/n8tVV5J26t3tl8HsqFdH6LrR/x2CFlxO usm8NFTQmMBN20cUx3MoH4og3GMCEgeeC6HII2ZKT7MgOCF46nVdpKZ0yhB2zhEjhVMH eW2PvG47izASXhE4djH1ECMsOhlarYLfBRO47IPoZMXsO1D0YOoF0ThHrvzcrf0uqLMv L4bQ== X-Gm-Message-State: AOAM532AheqJJSAjdF0PXmWnCAKI+kXIVnu7K1PWSSwn14ASWf8yMcfu ldoc3J6Onbvbp4ZGFccgoCr/vo8B+bEhEA== X-Google-Smtp-Source: ABdhPJx6MWaRQGEQ4vKFvDJaDpeZe6fvEGd0GzJ7B7tq5C5ebFeQDIsnz7cW5il1AjYVK6x6lPtazA== X-Received: by 2002:a05:6122:a13:: with SMTP id 19mr62507368vkn.3.1637001462110; Mon, 15 Nov 2021 10:37:42 -0800 (PST) Received: from birita.. ([2804:431:c7ca:66dc:13f5:e2fb:5a0d:90]) by smtp.gmail.com with ESMTPSA id e7sm8976565vkn.20.2021.11.15.10.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 10:37:41 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v6 02/20] elf: Add _dl_audit_objopen Date: Mon, 15 Nov 2021 15:37:16 -0300 Message-Id: <20211115183734.531155-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211115183734.531155-1-adhemerval.zanella@linaro.org> References: <20211115183734.531155-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, KAM_SHORT, 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_objopen() audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. --- elf/Makefile | 2 +- elf/dl-audit.c | 42 ++++++++++++++++++++++++++++++++++++++ elf/dl-load.c | 17 +-------------- elf/rtld.c | 23 ++------------------- sysdeps/generic/ldsodefs.h | 5 +++++ 5 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 elf/dl-audit.c diff --git a/elf/Makefile b/elf/Makefile index 8f3e3a3602..80ed31edbe 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -36,7 +36,7 @@ dl-routines = $(addprefix dl-,load lookup object reloc deps \ exception sort-maps lookup-direct \ call-libc-early-init write \ thread_gscope_wait tls_init_tp \ - debug-symbols minimal-malloc) + debug-symbols minimal-malloc audit) ifeq (yes,$(use-ldconfig)) dl-routines += dl-cache endif diff --git a/elf/dl-audit.c b/elf/dl-audit.c new file mode 100644 index 0000000000..24d8557f18 --- /dev/null +++ b/elf/dl-audit.c @@ -0,0 +1,42 @@ +/* Audit common functions. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#ifdef SHARED +void +_dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit) +{ + if (__glibc_likely (GLRO(dl_naudit) == 0) + || (check_audit && 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->objopen != NULL) + { + struct auditstate *state = link_map_audit_state (l, cnt); + state->bindflags = afct->objopen (l, nsid, &state->cookie); + l->l_audit_any_plt |= state->bindflags != 0; + } + + afct = afct->next; + } +} +#endif diff --git a/elf/dl-load.c b/elf/dl-load.c index 9538bcb7dc..907ab8f5f7 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1517,22 +1517,7 @@ cannot enable executable stack as shared object requires"); #ifdef SHARED /* Auditing checkpoint: we have a new object. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0) - && !GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) - { - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objopen != NULL) - { - struct auditstate *state = link_map_audit_state (l, cnt); - state->bindflags = afct->objopen (l, nsid, &state->cookie); - l->l_audit_any_plt |= state->bindflags != 0; - } - - afct = afct->next; - } - } + _dl_audit_objopen (l, nsid, true); #endif return l; diff --git a/elf/rtld.c b/elf/rtld.c index be2d5d8e74..647f476957 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1063,25 +1063,6 @@ ERROR: audit interface '%s' requires version %d (maximum supported version %d); dlmargs.map->l_auditing = 1; } -/* Notify the the audit modules that the object MAP has already been - loaded. */ -static void -notify_audit_modules_of_loaded_object (struct link_map *map) -{ - struct audit_ifaces *afct = GLRO(dl_audit); - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->objopen != NULL) - { - struct auditstate *state = link_map_audit_state (map, cnt); - state->bindflags = afct->objopen (map, LM_ID_BASE, &state->cookie); - map->l_audit_any_plt |= state->bindflags != 0; - } - - afct = afct->next; - } -} - /* Load all audit modules. */ static void load_audit_modules (struct link_map *main_map, struct audit_list *audit_list) @@ -1100,8 +1081,8 @@ load_audit_modules (struct link_map *main_map, struct audit_list *audit_list) program and the dynamic linker itself). */ if (GLRO(dl_naudit) > 0) { - notify_audit_modules_of_loaded_object (main_map); - notify_audit_modules_of_loaded_object (&GL(dl_rtld_map)); + _dl_audit_objopen (main_map, LM_ID_BASE, false); + _dl_audit_objopen (&GL(dl_rtld_map), LM_ID_BASE, false); } } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 1318c36dce..dec592bf53 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1391,6 +1391,11 @@ link_map_audit_state (struct link_map *l, size_t index) return &base[index]; } } + +/* 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. */ +void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit); #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED