From patchwork Thu Oct 10 18:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 1995693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xry111.site header.i=@xry111.site header.a=rsa-sha256 header.s=default header.b=N9UPnIvI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XPf8d4T6Mz1xsv for ; Fri, 11 Oct 2024 05:55:29 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F0B0385840A for ; Thu, 10 Oct 2024 18:55:27 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id BEA0E3858D37 for ; Thu, 10 Oct 2024 18:55:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BEA0E3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=xry111.site Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xry111.site ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BEA0E3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=89.208.246.23 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728586508; cv=none; b=TPtlZ4hataD952uVcbsNurxvPgNaz9Z5eOKt27e+yvLKRVbPvles6BDmU3Lahr28CeOJ5PmESbcba9Jp6GiLjXeR3U7f0wt0HvSxvQZnpmV1wk2G7qlReiYWw/22373+OABRwwiV7TouBd8YGZ/NxShLDbPxod6p9sUJRylVu8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728586508; c=relaxed/simple; bh=5MIHJ9+L864Yrdrm+fR56iAJ4Rj0Sebpr/FvmG0zFEc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=DLudoD/0o0fq1f4iGCIe6V5Q62Xx7DJ8fNIPwRV9scoNJBYw4k3NQL9uIN2ENgZu4bLBkerzYTv/dILvMLJLu3RPTG1gUQBDxA5izchsyNGzNc1ZGGDm7ZeNaLTu2T8wcyoliYt9NznSlJbjBUwSbd7bFWKjAUFIZX52shhPyns= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xry111.site; s=default; t=1728586505; bh=1hlCAbYZLBoahaY2WIIM3yq06+5ta4rbc1gbp3gDHyo=; h=From:To:Cc:Subject:Date:From; b=N9UPnIvIMfTSQuc0bn7uS3e4+Iq5AsuUm6oKZv61QZzRZ4Pr/bCj1rx+pQXuEiuXV GE+PV2Z7VZT9srrOMajmmzGGs9Hm0bWv5oUdm/k77MTPxCXC5jER3rI1gkKm8A/Bgi pOTc1rwN35FrrnmV5kByC9RWmS7elYA8pgNfCJFo= Received: from stargazer.. (unknown [IPv6:240e:358:113b:bf00:dc73:854d:832e:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id CF7A465F41; Thu, 10 Oct 2024 14:55:02 -0400 (EDT) From: Xi Ruoyao To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek , John David Anglin , Lulu Cheng , Florian Weimer , Xi Ruoyao Subject: [PATCH] Always set SECTION_RELRO for or .data.rel.ro{, .local} [PR116887] Date: Fri, 11 Oct 2024 02:54:12 +0800 Message-ID: <20241010185454.28007-1-xry111@xry111.site> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, LIKELY_SPAM_FROM, SPF_HELO_PASS, SPF_PASS, TXREP 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org At least two ports (hppa and loongarch) need to set SECTION_RELRO for .data.rel.ro{,.local} in section_type_flags (PR52999 and PR116887), and I cannot see a reason not to just set it in the generic code. With this applied we can also remove the hppa-specific pa_section_type_flags in a future patch. gcc/ChangeLog: PR target/116887 * varasm.cc (default_section_type_flags): Always set SECTION_RELRO if name is .data.rel.ro{,.local}. gcc/testsuite/ChangeLog: PR target/116887 * gcc.dg/pr116887.c: New test. --- Bootstrapped & regtested on x86_64-linux-gnu. Ok for trunk? gcc/testsuite/gcc.dg/pr116887.c | 23 +++++++++++++++++++++++ gcc/varasm.cc | 10 ++++------ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr116887.c diff --git a/gcc/testsuite/gcc.dg/pr116887.c b/gcc/testsuite/gcc.dg/pr116887.c new file mode 100644 index 00000000000..b7255e09a18 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr116887.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-fpic" } */ + +struct link_map +{ + struct link_map *l_next; +}; +struct rtld_global +{ + struct link_map *_ns_loaded; + char buf[4096]; + struct link_map _dl_rtld_map; +}; +extern struct rtld_global _rtld_global; +static int _dlfo_main __attribute__ ((section (".data.rel.ro"), used)); +void +_dlfo_process_initial (int ns) +{ + for (struct link_map *l = _rtld_global._ns_loaded; l != ((void *)0); + l = l->l_next) + if (l == &_rtld_global._dl_rtld_map) + asm (""); +} diff --git a/gcc/varasm.cc b/gcc/varasm.cc index 4426e7ce6c6..aa450092ce5 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -6863,6 +6863,9 @@ default_section_type_flags (tree decl, const char *name, int reloc) if (decl && TREE_CODE (decl) == FUNCTION_DECL) flags = SECTION_CODE; + else if (strcmp (name, ".data.rel.ro") == 0 + || strcmp (name, ".data.rel.ro.local") == 0) + flags = SECTION_WRITE | SECTION_RELRO; else if (decl) { enum section_category category @@ -6876,12 +6879,7 @@ default_section_type_flags (tree decl, const char *name, int reloc) flags = SECTION_WRITE; } else - { - flags = SECTION_WRITE; - if (strcmp (name, ".data.rel.ro") == 0 - || strcmp (name, ".data.rel.ro.local") == 0) - flags |= SECTION_RELRO; - } + flags = SECTION_WRITE; if (decl && DECL_P (decl) && DECL_COMDAT_GROUP (decl)) flags |= SECTION_LINKONCE;