From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 109EA3858002 for ; Tue, 12 Apr 2022 18:42:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 109EA3858002 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-601-VPHvyPtKOKGJ0xgbEPbxeQ-1; Tue, 12 Apr 2022 14:42:26 -0400 X-MC-Unique: VPHvyPtKOKGJ0xgbEPbxeQ-1 Received: by mail-qt1-f198.google.com with SMTP id bt12-20020ac8690c000000b002ee65af14d0so4573755qtb.22 for ; Tue, 12 Apr 2022 11:42:26 -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=hTg5V7EjYiHayHFaLxG65K5eA8kPrIi/dN89ivOXnUk=; b=P26p+Zy3RFweRtxXWR/LUXbsjmTocM1Q4BI0LzcqFvQ+qUxTzJwn6Ot1ftFBIr65of WaWFIWWRqZJcZxXWVU9NtmMZzoduqs2FJ82zogT2gT1h0L/Tgm0iF6Zcdjutj5DHv/+a T+o2h1wbnMCPUCtdnHvqOHytQsvo5Z0udKoh1G45OLCo6gAoPSNQfrK/07DzZvTPrHIL BfmwXpE7JGJezjD/TA83U2hjh9Sfk4dohUbhErJ0X2MKMUIucNt4/QFDPycuD+ZB3LJV G2NBm74dfG77/gxZDCNPrXcBAbMfB+5jxgM3/Snjffffeth372shWXDIQv55xrLvrtt4 g1DQ== X-Gm-Message-State: AOAM532yydfGVlH755q72fCZuKCFUuJofPjFWZSvitgIAspAJn6GtHSb 5rLV6tq2BI176p88WGJB8+Wx6Atxhq8GTGMMF4ekWkzQjyA77/e6c9IKtgvlfRpcBzAKAA71qrQ jc8n0PfkgaN57TvEMQKj+mgwkive7dduNG0/SrypN0aLOVyFnXAKzQdqj6OkzSXkVdLzL1W4= X-Received: by 2002:ac8:6f16:0:b0:2ee:4eaa:c9ee with SMTP id bs22-20020ac86f16000000b002ee4eaac9eemr4502894qtb.374.1649788945358; Tue, 12 Apr 2022 11:42:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcQ+EapCiDprKBfT9KEaiFyCgmeFo68T01ZTdZwgBf0lPxvaVOgZa55Tj3w3lO4ggkgEJ4uQ== X-Received: by 2002:ac8:6f16:0:b0:2ee:4eaa:c9ee with SMTP id bs22-20020ac86f16000000b002ee4eaac9eemr4502877qtb.374.1649788944994; Tue, 12 Apr 2022 11:42:24 -0700 (PDT) Received: from athas.redhat.com (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id j19-20020a05622a039300b002ecc2ebfd87sm10953840qtx.32.2022.04.12.11.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:42:24 -0700 (PDT) From: Carlos O'Donell To: libc-stable@sourceware.org Cc: Adhemerval Zanella , Florian Weimer Subject: [PATCH 08/27] elf: Add _dl_audit_objopen Date: Tue, 12 Apr 2022 14:41:46 -0400 Message-Id: <20220412184205.3343677-9-carlos@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412184205.3343677-1-carlos@redhat.com> References: <20220412184205.3343677-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: application/octet-stream; x-default=true X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 18:42:36 -0000 From: Adhemerval Zanella It consolidates the code required to call la_objopen audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer (cherry picked from commit aee6e90f93e285016b6cd9c8bd00402c19ba271b) Resolved conflicts: elf/Makefile --- elf/Makefile | 1 + elf/dl-audit.c | 39 ++++++++++++++++++++++++++++++++++++++ elf/dl-load.c | 18 ++---------------- elf/rtld.c | 23 ++-------------------- sysdeps/generic/ldsodefs.h | 5 +++++ 5 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 elf/dl-audit.c diff --git a/elf/Makefile b/elf/Makefile index 4818a6b3fe..ceac1a9db4 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -116,6 +116,7 @@ elide-routines.os = \ # interpreter and operating independent of libc. rtld-routines = \ $(all-dl-routines) \ + dl-audit \ dl-compat \ dl-conflict \ dl-diagnostics \ diff --git a/elf/dl-audit.c b/elf/dl-audit.c new file mode 100644 index 0000000000..4066dfe851 --- /dev/null +++ b/elf/dl-audit.c @@ -0,0 +1,39 @@ +/* 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 + +void +_dl_audit_objopen (struct link_map *l, Lmid_t nsid) +{ + if (__glibc_likely (GLRO(dl_naudit) == 0)) + 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; + } +} diff --git a/elf/dl-load.c b/elf/dl-load.c index a8c6df3959..a2d73d025c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1515,22 +1515,8 @@ 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; - } - } + if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) + _dl_audit_objopen (l, nsid); #endif return l; diff --git a/elf/rtld.c b/elf/rtld.c index e52e9cd66e..c8a0958b12 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); + _dl_audit_objopen (&GL(dl_rtld_map), LM_ID_BASE); } } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index fcbbf69748..a3b45d60b9 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1360,6 +1360,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. */ +void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) + attribute_hidden; #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED -- 2.35.1