From patchwork Wed Sep 4 18:50:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 97100 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 62685384F01B for ; Wed, 4 Sep 2024 18:51:06 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 0BCB33858424 for ; Wed, 4 Sep 2024 18:50:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BCB33858424 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 0BCB33858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475833; cv=none; b=n9aOhUo+k45qULg/qR8dXh7najvIPI3m+U8UTHmtUmFSvVCyRsBX2ypTkOm0kdS1TB1CDmAgADfjgYvaY0cdhMKhbErQ4ooCX7MsRrBUtsJMmTtuMf0eWS7jJgkpmCgswp1jsPNs6e7GHkNpel84J4BtGsYRdYPeQbixhv/Zd4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475833; c=relaxed/simple; bh=GLjf5WNUa2sIel0FD0CqmjvAWUliXWG5oJOBiZjZgVI=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=IKNlrs1jMtNwdtGn244mNbmgtCK+rsUjd94UlbHEgzDaVcqgv96dfg8DIxslY1h0AqvfFEx6AE8DUfdnn/5GWk29uCarOlGCMMx8gnUmIfgnGrcG3xPVvAQmmw4l6RGMHaB2H1ArTrh0YZr7i8zWLv5q3GU19/cajJqezx3gAEY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725475830; 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=qzEXZPgzeijLn4gGHhl7U4D0BAktf2x/2CACvoFt1KQ=; b=YiPnJslyr2xyc089M6r+VgciBR4I6joOBVaZ90k0rNLXPjqnF3UxLOLLnROh5rtlA9eBOl Ak2XITmlzn+g5U/SI4CxZlspUvkgqw4cZooP59iKpgTNqzXnSI3lH6ShcvIdbm6BACOOUU YxwvYO0VSVwMSvxI735H9VCv/qwmNFs= Received: from mx-prod-mc-02.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-35-E6jaJPqlOsqepmxEiX-ETA-1; Wed, 04 Sep 2024 14:50:29 -0400 X-MC-Unique: E6jaJPqlOsqepmxEiX-ETA-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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 712DF1953940 for ; Wed, 4 Sep 2024 18:50:28 +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 81DF21955F44 for ; Wed, 4 Sep 2024 18:50:27 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 1/4] elf: Update DSO list, write audit log to elf/tst-audit23.out In-Reply-To: Message-ID: References: X-From-Line: ab406d5b54ac0f5f2faee60aabd35863e43b0ef6 Mon Sep 17 00:00:00 2001 Date: Wed, 04 Sep 2024 20:50:25 +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_H3, 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 After commit 1d5024f4f052c12e404d42d3b5bfe9c3e9fd27c4 ("support: Build with exceptions and asynchronous unwind tables [BZ #30587]"), libgcc_s is expected to show up in the DSO list on 32-bit Arm. Do not update max_objs because vdso is not tracked (and which is the reason why the test currently passes even with libgcc_s present). Also write the log output from the auditor to standard output, for easier test debugging. Reviewed-by: Adhemerval Zanella --- elf/tst-audit23.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c index d2640fe8b2..895dab08ea 100644 --- a/elf/tst-audit23.c +++ b/elf/tst-audit23.c @@ -85,13 +85,28 @@ do_test (int argc, char *argv[]) = support_capture_subprogram (spargv[0], spargv, NULL); support_capture_subprocess_check (&result, "tst-audit22", 0, sc_allow_stderr); + { + FILE *fp = fmemopen (result.err.buffer, result.err.length, "r"); + TEST_VERIFY (fp != NULL); + unsigned int line = 0; + char *buffer = NULL; + size_t buffer_length = 0; + puts ("info: *** audit log start ***"); + while (xgetline (&buffer, &buffer_length, fp)) + printf ("%6u\t%s", ++line, buffer); + puts ("info: *** audit log end ***"); + free (buffer); + xfclose (fp); + } + /* The expected la_objopen/la_objclose: 1. executable 2. loader 3. libc.so - 4. tst-audit23mod.so - 5. libc.so (LM_ID_NEWLM). - 6. vdso (optional and ignored). */ + 4. libgcc_s.so (one some architectures, for libsupport) + 5. tst-audit23mod.so + 6. libc.so (LM_ID_NEWLM). + vdso (optional and ignored). */ enum { max_objs = 6 }; struct la_obj_t { @@ -115,8 +130,10 @@ do_test (int argc, char *argv[]) TEST_VERIFY (out != NULL); char *buffer = NULL; size_t buffer_length = 0; + unsigned int line = 0; while (xgetline (&buffer, &buffer_length, out)) { + ++line; if (startswith (buffer, "la_activity: ")) { uintptr_t cookie; @@ -174,8 +191,8 @@ do_test (int argc, char *argv[]) if (is_vdso (lname)) continue; if (nobjs == max_objs) - FAIL_EXIT1 ("non expected la_objopen: %s %"PRIxPTR" %ld", - lname, laddr, lmid); + FAIL_EXIT1 ("(line %u) non expected la_objopen: %s %"PRIxPTR" %ld", + line, lname, laddr, lmid); objs[nobjs].lname = lname; objs[nobjs].laddr = laddr; objs[nobjs].lmid = lmid; 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); } From patchwork Wed Sep 4 18:50:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 97102 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 478AB3861028 for ; Wed, 4 Sep 2024 18:52:10 +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 DF878386182F for ; Wed, 4 Sep 2024 18:50:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF878386182F 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 DF878386182F 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=1725475843; cv=none; b=rJ8PjlPuVOCxoZInmLuu6aFe1ld499azXItnltT5yyWpvVAHWswR/qXABfhkeMf7zK165sjq9kMiFYPddnhIxVUfbz/8svVT/PUFPR0kNRjmEHXNMyQlXTJ+5Or0ySrWpJjkn4kPwJ+FmwJuXuO/fWNZm0g3GMZaGbNsBOgqDro= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475843; c=relaxed/simple; bh=uKUO82o5ZiAtmKU5lwS9vWjx8O3XRyIdTgQotGpacN8=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=ZF6XtCejEd9Wy9iB5j9gegno/IGLVPa0UMdi0LTR5L1WAf1ko0YY+Bx5xbIv8BwmiSisdjBHGg/O/UD/DYCQSy8CbRUIkeAVBlAxhgOfpy/Qq5qNUYuEha7KHmcKH0hPwFYaIatRybNAzb3C7AWcU2KUJLCLa3hpZh8sUjZHCJU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725475841; 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=yRVvAgyDHqfPXDF3/HyhNJo+/kpXhvfHR0uQRAbQdz8=; b=IDlFzaEraCdRccczDhp3JgOYZvWAb60cjbjVFFFznN9Jh7wW91bDQQW/3nXc7ME/Tk2+W1 Lm4PmPGUwOY7hFQ5Wpujqrtr58QIoi0BPD0UpSPuKluHs2GsjCvY+8Cg56TSBoIm0vNLZl SREK4MsdPZiZ5NXwVG50mAluSQzIqLA= 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-372-PWiBi2nZNwuG4yf-ULM4cw-1; Wed, 04 Sep 2024 14:50:40 -0400 X-MC-Unique: PWiBi2nZNwuG4yf-ULM4cw-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 B673D19560B5 for ; Wed, 4 Sep 2024 18:50:39 +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 F37CA1955D42 for ; Wed, 4 Sep 2024 18:50:38 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 3/4] elf: Call la_objclose for proxy link maps in _dl_fini (bug 32065) In-Reply-To: Message-ID: <0945a498244cb104922a4a7397ae6fadc75fcca8.1725475670.git.fweimer@redhat.com> References: X-From-Line: 0945a498244cb104922a4a7397ae6fadc75fcca8 Mon Sep 17 00:00:00 2001 Date: Wed, 04 Sep 2024 20:50:36 +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-fini.c | 9 +++++++++ elf/tst-audit23.c | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) Reviewed-by: Adhemerval Zanella diff --git a/elf/dl-fini.c b/elf/dl-fini.c index db996270de..a1a4c25829 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -69,6 +69,7 @@ _dl_fini (void) unsigned int i; struct link_map *l; + struct link_map *proxy_link_map = NULL; assert (nloaded != 0 || GL(dl_ns)[ns]._ns_loaded == NULL); for (l = GL(dl_ns)[ns]._ns_loaded, i = 0; l != NULL; l = l->l_next) /* Do not handle ld.so in secondary namespaces. */ @@ -84,6 +85,11 @@ _dl_fini (void) are not dlclose()ed from underneath us. */ ++l->l_direct_opencount; } + else + /* Used below to call la_objclose for the ld.so proxy + link map. */ + proxy_link_map = l; + assert (ns != LM_ID_BASE || i == nloaded); assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1); unsigned int nmaps = i; @@ -122,6 +128,9 @@ _dl_fini (void) --l->l_direct_opencount; } + if (proxy_link_map != NULL) + _dl_audit_objclose (proxy_link_map); + #ifdef SHARED _dl_audit_activity_nsid (ns, LA_ACT_CONSISTENT); #endif diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c index 462548d5ab..357d70478b 100644 --- a/elf/tst-audit23.c +++ b/elf/tst-audit23.c @@ -243,13 +243,26 @@ do_test (int argc, char *argv[]) } } + Lmid_t lmid_other = LM_ID_NEWLM; + unsigned int other_namespace_count = 0; for (size_t i = 0; i < nobjs; i++) { - /* 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); + if (objs[i].lmid != LM_ID_BASE) + { + if (lmid_other == LM_ID_NEWLM) + lmid_other = objs[i].lmid; + TEST_COMPARE (objs[i].lmid, lmid_other); + ++other_namespace_count; + if (!(endswith (objs[i].lname, "/" LIBC_SO) + || endswith (objs[i].lname, "/" LD_SO))) + FAIL ("unexpected object in secondary namespace: %s", + objs[i].lname); + } + TEST_COMPARE (objs[i].closed, true); free (objs[i].lname); } + /* Both libc.so and ld.so should be present. */ + TEST_COMPARE (other_namespace_count, 2); /* la_activity(LA_ACT_CONSISTENT) should be the last callback received. Since only one link map may be not-CONSISTENT at a time, this also From patchwork Wed Sep 4 18:50:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 97103 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 919E23858433 for ; Wed, 4 Sep 2024 18:53:08 +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.129.124]) by sourceware.org (Postfix) with ESMTP id E04B13858424 for ; Wed, 4 Sep 2024 18:50:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E04B13858424 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 E04B13858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475850; cv=none; b=WbBmOkd0zx+9laV3qd2758x4wxgwIcwYpK5ARHasst4uBqX0vND60pkUUmEpTgLBD8QQ79r+AuSUDsJ5/q9So6TleO7Vb2OlBTa0ADwBt335QEg7aMw9E06RA9Zx6A8vVJkL5C0ZlIDqe0HLLHfgDbbhjIy6yQpRIf+dWFwzMaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725475850; c=relaxed/simple; bh=neCUqhj9NOsfHaPi4iUYDCYrsGZYKc8Ab4He6rm4PAU=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=OjiV2rIYOAlTapLxqbI/nIP5Di45bnBpcvo2rsUetCkOFCaYJ4yOKRk9IhOHgohYlBksTF3lzQtVHbiwUPKlXbnFcF27Cllz7HMqJUfPUdUC+8yPzM792eqS4rOrTFf4XPT9Ps2H6vKMYxpsJ6uPFXr175Bn/ZIiKKLm1ClAKcQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725475847; 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=RHrh5tZAJsq9WkNCr9cERSk63xrE7r9IVA4YhiIi+8k=; b=g7cqZ1XIwysjdMONSQRTv1pdFnNyFX34cV71aWyTtCA1VYbdZWAtLQB/3liwMLi5vW4yTn fm20O6IF7/FB1HWapluhE/s5JuhhyRWwhYOneXGXdf1McsHtdY3pg2SKqlhDjrVqJxyat4 wDozYH/1cWnhDKtroQPkeheuUJ+TwpE= Received: from mx-prod-mc-05.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-263-6DIWaxgpMpKsfF-aTg3ffw-1; Wed, 04 Sep 2024 14:50:46 -0400 X-MC-Unique: 6DIWaxgpMpKsfF-aTg3ffw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8EAC7195608A for ; Wed, 4 Sep 2024 18:50:45 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.35]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB87F3000236 for ; Wed, 4 Sep 2024 18:50:44 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v3 4/4] elf: Reorder audit events in dlcose to match _dl_fini (bug 32066) In-Reply-To: Message-ID: References: X-From-Line: fba2e345e453fc3423a63f1a918156656c9f1602 Mon Sep 17 00:00:00 2001 Date: Wed, 04 Sep 2024 20:50:41 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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_H3, 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 This was discovered after extending elf/tst-audit23 to cover dlclose of the dlmopen namespace. Auditors already experience the new order during process shutdown (_dl_fini), so no LAV_CURRENT bump or backwards compatibility code seems necessary. Reviewed-by: Adhemerval Zanella --- elf/dl-close.c | 14 ++++++++------ elf/tst-audit23.c | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/elf/dl-close.c b/elf/dl-close.c index 88226245eb..432a35b141 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -264,6 +264,12 @@ _dl_close_worker (struct link_map *map, bool force) _dl_catch_exception (NULL, _dl_call_fini, imap); #ifdef SHARED + /* Auditing checkpoint: we will start deleting objects. + This is supposed to happen before la_objclose (see _dl_fini), + but only once per non-recursive dlclose call. */ + if (!unload_any) + _dl_audit_activity_nsid (nsid, LA_ACT_DELETE); + /* Auditing checkpoint: we remove an object. */ _dl_audit_objclose (imap); #endif @@ -424,12 +430,8 @@ _dl_close_worker (struct link_map *map, bool force) if (!unload_any) goto out; -#ifdef SHARED - /* Auditing checkpoint: we will start deleting objects. */ - _dl_audit_activity_nsid (nsid, LA_ACT_DELETE); -#endif - - /* Notify the debugger we are about to remove some loaded objects. */ + /* Notify the debugger we are about to remove some loaded objects. + LA_ACT_DELETE has already been signalled above for !unload_any. */ struct r_debug *r = _dl_debug_update (nsid); r->r_state = RT_DELETE; _dl_debug_state (); diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c index 357d70478b..e536736037 100644 --- a/elf/tst-audit23.c +++ b/elf/tst-audit23.c @@ -30,16 +30,21 @@ #include #include #include +#include static int restart; +static int do_dlclose; #define CMDLINE_OPTIONS \ - { "restart", no_argument, &restart, 1 }, + { "restart", no_argument, &restart, 1 }, \ + { "dlclose", no_argument, &do_dlclose, 1 }, \ static int handle_restart (void) { xdlopen ("tst-audit23mod.so", RTLD_NOW); - xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW); + void *handle = xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW); + if (do_dlclose) + xdlclose (handle); return 0; } @@ -67,8 +72,8 @@ is_vdso (const char *str) || startswith (str, "linux-vdso"); } -static int -do_test (int argc, char *argv[]) +static void +do_one_test (int argc, char *argv[], bool pass_dlclose_flag) { /* We must have either: - One or four parameters left if called initially: @@ -76,16 +81,15 @@ do_test (int argc, char *argv[]) + "--library-path" optional + the library path optional + the application name */ - if (restart) - return handle_restart (); - - char *spargv[9]; + char *spargv[10]; TEST_VERIFY_EXIT (((argc - 1) + 3) < array_length (spargv)); int i = 0; for (; i < argc - 1; i++) spargv[i] = argv[i + 1]; spargv[i++] = (char *) "--direct"; spargv[i++] = (char *) "--restart"; + if (pass_dlclose_flag) + spargv[i++] = (char *) "--dlclose"; spargv[i] = NULL; setenv ("LD_AUDIT", "tst-auditmod23.so", 0); @@ -153,8 +157,14 @@ do_test (int argc, char *argv[]) /* The cookie identifies the object at the head of the link map, so we only add a new namespace if it changes from the previous - one. This works since dlmopen is the last in the test body. */ - if (cookie != last_act_cookie && last_act_cookie != -1) + one. This works since dlmopen is the last in the test body. + + Currently, this does not work as expected because there + is no head link map if a namespace is completely deleted. + No LA_ACT_CONSISTENT event is generated in that case. + See the comment in _dl_audit_activity_nsid and bug 32068. */ + if (cookie != last_act_cookie && last_act_cookie != -1 + && !pass_dlclose_flag) TEST_COMPARE (last_act, LA_ACT_CONSISTENT); if (this_act == LA_ACT_ADD && acts[nacts] != cookie) @@ -272,7 +282,16 @@ do_test (int argc, char *argv[]) free (buffer); xfclose (out); +} + +static int +do_test (int argc, char *argv[]) +{ + if (restart) + return handle_restart (); + do_one_test (argc, argv, false); + do_one_test (argc, argv, true); return 0; }