From patchwork Mon Nov 13 17:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 79773 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 0F8CC385F026 for ; Mon, 13 Nov 2023 17:21:26 +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 ESMTPS id 363AD3858C01 for ; Mon, 13 Nov 2023 17:21:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 363AD3858C01 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 363AD3858C01 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=1699896073; cv=none; b=eKADwRzsmN/JjDSkq588VK+r/EG/Cof4x/qCGIHPvhVV0eDej6VCgTWWrjBcshqZ6UplryG7rrXq6w+TxQvQ/czhTpuPy5V5Br1c+KO6cSAWF0E0joG3L82aUXUsMNd279WMD6Hfbps5fLAXXbat4EDeke5hJzG6XYxAe4ZTFJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699896073; c=relaxed/simple; bh=GYef85dOh0ZR4+9CaODlSq2durLwRKnXhmY6JdhB9nc=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=FrSWDplmUw8MxFEThM5qW+yq9Y1WjpmO0Y3EwmsdYcsEPr0Sz+7oY8Ola6IJXj4Q1F1zWtWbGYmlA6muPTPgY1Y2suzv3/3Uvut9MoMpTLe3q+t+Cc7gBf1HlA6Yii1LxbJ9+AXbqt1AdPyl5QJqZx39QbiHan32K/G+AljOpwk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699896071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=oeZ7avRpcuOytrxE/azbutSag3ba2TKa+I+dnGana9o=; b=KlYxMHdRI+1AkpnI3DMRuZtjxB3LZwxnfER5hRJo943WYKtupRbPagaIJjY1Pz5n9RH+Hr fOyBQkI1JmJZfoA0gIqziRystIDylVzQf9d/s7Kv+WaHrjoGXfVTtezrgVXVp/8GuDBcJM hfNUzuoxX3aKX5ywT8m1y2dXftUQSyU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-bX5qIlngPTeCXK9oD6hRfA-1; Mon, 13 Nov 2023 12:21:10 -0500 X-MC-Unique: bX5qIlngPTeCXK9oD6hRfA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id AACDF3813BC3 for ; Mon, 13 Nov 2023 17:21:09 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 424752166B29 for ; Mon, 13 Nov 2023 17:21:09 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 1/2] nptl: Rename tst-execstack to tst-execstack-threads Message-ID: <2d447c2aaead261f4449231379c4d1a15bf210a6.1699896042.git.fweimer@redhat.com> X-From-Line: 2d447c2aaead261f4449231379c4d1a15bf210a6 Mon Sep 17 00:00:00 2001 Date: Mon, 13 Nov 2023 18:21:07 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 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, 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 So that the test is harder to confuse with elf/tst-execstack (although the tests are supposed to be the same). Reviewed-by: Adhemerval Zanella --- elf/tst-execstack.c | 7 ++++++- nptl/Makefile | 10 +++++----- ...tst-execstack-mod.c => tst-execstack-threads-mod.c} | 0 nptl/{tst-execstack.c => tst-execstack-threads.c} | 0 4 files changed, 11 insertions(+), 6 deletions(-) rename nptl/{tst-execstack-mod.c => tst-execstack-threads-mod.c} (100%) rename nptl/{tst-execstack.c => tst-execstack-threads.c} (100%) base-commit: 2d27dc1c750849f888b38fa7f0dadf6b376095de diff --git a/elf/tst-execstack.c b/elf/tst-execstack.c index 7e898b4f58..560b353918 100644 --- a/elf/tst-execstack.c +++ b/elf/tst-execstack.c @@ -137,7 +137,12 @@ do_test (void) #endif /* Loading this module should force stacks to become executable. */ - void *h = dlopen ("tst-execstack-mod.so", RTLD_LAZY); +#if USE_PTHREADS + const char *soname = "tst-execstack-threads-mod.so"; +#else + const char *soname = "tst-execstack-mod.so"; +#endif + void *h = dlopen (soname, RTLD_LAZY); if (h == NULL) { printf ("cannot load: %s\n", dlerror ()); diff --git a/nptl/Makefile b/nptl/Makefile index d969419af7..015295e45c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -466,7 +466,7 @@ tests-internal += \ tst-tls5 \ # tests-internal ifeq ($(have-z-execstack),yes) -tests += tst-execstack +tests += tst-execstack-threads endif endif @@ -474,7 +474,7 @@ modules-names = \ tst-audit-threads-mod1 \ tst-audit-threads-mod2 \ tst-compat-forwarder-mod \ - tst-execstack-mod \ + tst-execstack-threads-mod \ tst-stack4mod \ tst-tls3mod \ tst-tls5mod \ @@ -669,9 +669,9 @@ endif tst-exec4-ARGS = $(host-test-program-cmd) -$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so -LDFLAGS-tst-execstack = -Wl,-z,noexecstack -CFLAGS-tst-execstack-mod.c += -Wno-trampolines +$(objpfx)tst-execstack-threads.out: $(objpfx)tst-execstack-threads-mod.so +LDFLAGS-tst-execstack-threads = -Wl,-z,noexecstack +CFLAGS-tst-execstack-threads-mod.c += -Wno-trampolines tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" diff --git a/nptl/tst-execstack-mod.c b/nptl/tst-execstack-threads-mod.c similarity index 100% rename from nptl/tst-execstack-mod.c rename to nptl/tst-execstack-threads-mod.c diff --git a/nptl/tst-execstack.c b/nptl/tst-execstack-threads.c similarity index 100% rename from nptl/tst-execstack.c rename to nptl/tst-execstack-threads.c From patchwork Mon Nov 13 17:21:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 79774 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 444F83857707 for ; Mon, 13 Nov 2023 17:21:29 +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 ESMTPS id F2A6C3857344 for ; Mon, 13 Nov 2023 17:21:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F2A6C3857344 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 F2A6C3857344 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=1699896077; cv=none; b=jeT9ud1LFlH7XEjLLwbVBJvqbwmI/psjZd/wXQFS3xs3JRAPO5MFF0Pe/mz7nu+aIrzbynA6LFhL/WrVAownMhLpum2/aGythhPhUtUC4Cn3O+1T/l4N0vAYzpoMgA6sZaQR3YzEafVTruzLTA73eqilL1BRoupsMS1i19lUPdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699896077; c=relaxed/simple; bh=iWTR8Jw5weNEPJf2703aQsUjnbuLFQwBghd/zCijoHA=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=XxM98QfU+YFTA0zsACv2C7uENJh+braK7MYyr3SMNVxA9A9+qIIc5mKi4ILWTLU1uV3TtwC1T1dod4/VL+CMs91VxXoX8o1MsLkNsEiYYqeICAfKn/GS9M42TgYksXYviiwihoPWgiRxcEgJsv0qUMNh0WGFBFGcRSfnOnXiWIw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699896075; 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=eQa3U+CWx6BprnXnNo3i0j/V8pQZr3UcSjYlPVACI28=; b=FxfFWLPPZCHvOFH3x2JfN6i5xjkmuZazBZrASHbsa8ye2Sjgu/GfoLRe2KREYF9RCk+1MQ lPtm1HJhrl4ndtN1VLcYau8gRJM1oAfVe7FdefT8pjqWrs7Pl/mk4MN/J7mb+1uly2Ugff DeSPFifiu4LFy+xgYNZJAr1A/SaUiGc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-c596skMzM3SffcVW1N-NVA-1; Mon, 13 Nov 2023 12:21:14 -0500 X-MC-Unique: c596skMzM3SffcVW1N-NVA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18FC3811E88 for ; Mon, 13 Nov 2023 17:21:14 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 733341C060B9 for ; Mon, 13 Nov 2023 17:21:13 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 2/2] nptl: Link tst-execstack-threads-mod.so with -z execstack In-Reply-To: <2d447c2aaead261f4449231379c4d1a15bf210a6.1699896042.git.fweimer@redhat.com> Message-ID: <69bd76edaca4b5ce51ea716d249424f16c7929f9.1699896042.git.fweimer@redhat.com> References: <2d447c2aaead261f4449231379c4d1a15bf210a6.1699896042.git.fweimer@redhat.com> X-From-Line: 69bd76edaca4b5ce51ea716d249424f16c7929f9 Mon Sep 17 00:00:00 2001 Date: Mon, 13 Nov 2023 18:21:11 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.6 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, 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 ensures that the test still links with a linker that refuses to create an executable stack marker automatically. Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/nptl/Makefile b/nptl/Makefile index 015295e45c..067b01ea8e 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -671,6 +671,7 @@ tst-exec4-ARGS = $(host-test-program-cmd) $(objpfx)tst-execstack-threads.out: $(objpfx)tst-execstack-threads-mod.so LDFLAGS-tst-execstack-threads = -Wl,-z,noexecstack +LDFLAGS-tst-execstack-threads-mod.so = -Wl,-z,execstack CFLAGS-tst-execstack-threads-mod.c += -Wno-trampolines tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"