From patchwork Wed Sep 4 18:50:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 97101 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 E74A93861839 for ; Wed, 4 Sep 2024 18:51:12 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id D2059385EC35 for ; Wed, 4 Sep 2024 18:50:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2059385EC35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D2059385EC35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475839; cv=none; b=fbURlZy63AXb/gTYoXR5cT2+ykEIn2obSwFF81KQKIqIHm7NtR2eErDhnrV1UDd82puo2uLohMMNNsas18bhb2z3PO6LHoXI53k5cCC3VjrQBw7WVGUGioU5c46C818XdCc1P3hHJ5T8EnC+UfpJbqfbz13Vw89zf33K/5dgU1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475839; c=relaxed/simple; bh=tjb2R+VZVmP8SWtnEOhD+kKKwF+wy12q4k6ksKmPCyM=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=kOERH54nlqJSJ6Wpa0eZudkuJlGmzItMtbnUi6txaqfKikKxWB7yzm3BgLqGisT1G/+xq9CP/MjNCHfMsBtIgTSNJgvuFwHjuCmsG3jzA2Db1vnDMEIZneEiSlIpEayly1ZdVMqp2lS61C4fywtxuKL9zxVFDqoCV+Dt/LSHmrE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725475836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JpQG6GIfu2/JKvLtKH81sPO9wQhzuq3NFjw2+q/HjrM=; b=Ha9ZJEYkqwEq2jhDkWcsTkYxgffrpRFIX/5TqVi4MP65TzQM4qdZmhtAOvfk65yhyqlFvr 3a3P7PSYLwkMggTJdNREsZdrV+bbW+oO60a9ADdVjfMkKYuRDystVLRDHFIM3InqPwFlhP ZDHUvRPWjZ//fHgAS9Ab1EBGpPHi6oU= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-ye3jxh9COFypPitZrkjrCw-1; Wed, 04 Sep 2024 14:50:35 -0400 X-MC-Unique: ye3jxh9COFypPitZrkjrCw-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 313861955D4A for ; Wed, 4 Sep 2024 18:50:34 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.35]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 274961955F44 for ; Wed, 4 Sep 2024 18:50:32 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 2/4] elf: Signal la_objopen for the proxy link map in dlmopen (bug 31985) In-Reply-To: Message-ID: <2d61292b6540c179209f4b9e16703370723731b6.1725475670.git.fweimer@redhat.com> References: X-From-Line: 2d61292b6540c179209f4b9e16703370723731b6 Mon Sep 17 00:00:00 2001 Date: Wed, 04 Sep 2024 20:50:30 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org --- elf/dl-load.c | 61 ++++++++++++++++++++++++++--------------------- elf/tst-audit23.c | 15 ++++++++++-- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 8a89b71016..54c9c4d779 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -918,6 +918,37 @@ _dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph) } } +static void +_dl_notify_new_object (int mode, Lmid_t nsid, struct link_map *l) +{ + /* Signal that we are going to add new objects. */ + struct r_debug *r = _dl_debug_update (nsid); + if (r->r_state == RT_CONSISTENT) + { +#ifdef SHARED + /* Auditing checkpoint: we are going to add new objects. Since this + is called after _dl_add_to_namespace_list the namespace is guaranteed + to not be empty. */ + 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 + call _dl_debug_initialize in a static program in case dynamic + linking has not been used before. */ + r->r_state = RT_ADD; + _dl_debug_state (); + LIBC_PROBE (map_start, 2, nsid, r); + } + else + assert (r->r_state == RT_ADD); + +#ifdef SHARED + /* Auditing checkpoint: we have a new object. */ + if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) + _dl_audit_objopen (l, nsid); +#endif +} /* Map in the shared object NAME, actually located in REALNAME, and already opened on FD. */ @@ -1018,6 +1049,8 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, /* Add the map for the mirrored object to the object list. */ _dl_add_to_namespace_list (l, nsid); + _dl_notify_new_object (mode, nsid, l); + return l; } #endif @@ -1442,33 +1475,7 @@ cannot enable executable stack as shared object requires"); if (mode & __RTLD_SPROF) return l; - /* Signal that we are going to add new objects. */ - struct r_debug *r = _dl_debug_update (nsid); - if (r->r_state == RT_CONSISTENT) - { -#ifdef SHARED - /* Auditing checkpoint: we are going to add new objects. Since this - is called after _dl_add_to_namespace_list the namespace is guaranteed - to not be empty. */ - 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 - call _dl_debug_initialize in a static program in case dynamic - linking has not been used before. */ - r->r_state = RT_ADD; - _dl_debug_state (); - LIBC_PROBE (map_start, 2, nsid, r); - } - else - assert (r->r_state == RT_ADD); - -#ifdef SHARED - /* Auditing checkpoint: we have a new object. */ - if (!GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) - _dl_audit_objopen (l, nsid); -#endif + _dl_notify_new_object (mode, nsid, l); return l; } diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c index 895dab08ea..462548d5ab 100644 --- a/elf/tst-audit23.c +++ b/elf/tst-audit23.c @@ -52,6 +52,14 @@ startswith (const char *str, const char *pre) return lenstr >= lenpre && memcmp (pre, str, lenpre) == 0; } +static inline bool +endswith (const char *str, const char *suf) +{ + size_t lensuf = strlen (suf); + size_t lenstr = strlen (str); + return lenstr >= lensuf && memcmp (suf, str + lenstr - lensuf, lensuf) == 0; +} + static inline bool is_vdso (const char *str) { @@ -106,8 +114,9 @@ do_test (int argc, char *argv[]) 4. libgcc_s.so (one some architectures, for libsupport) 5. tst-audit23mod.so 6. libc.so (LM_ID_NEWLM). + 7. loader (proxy link map in new namespace) vdso (optional and ignored). */ - enum { max_objs = 6 }; + enum { max_objs = 7 }; struct la_obj_t { char *lname; @@ -236,7 +245,9 @@ do_test (int argc, char *argv[]) for (size_t i = 0; i < nobjs; i++) { - TEST_COMPARE (objs[i].closed, true); + /* This subtest currently does not pass because of bug 32065. */ + if (! (endswith (objs[i].lname, LD_SO) && objs[i].lmid != LM_ID_BASE)) + TEST_COMPARE (objs[i].closed, true); free (objs[i].lname); }