From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id B18993858C78 for ; Tue, 15 Feb 2022 01:10:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B18993858C78 Received: by mail-pl1-x62c.google.com with SMTP id u12so11849524plf.13 for ; Mon, 14 Feb 2022 17:10:28 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=x5MH9lpl+tWQ0rL+yY82zATle+QCdU36uG/4CmRzH8c=; b=mmqal40ApsIanR8Wbc/Wqg7oc3hpPu07DynpohhrHG4iADnDm4z5+IyMbe/yYphFe6 zCvukaXVgqzd0kMPGXSyPDpz/FfRr5txHOV9/XTBV6+tHtkpEKPiwf7G10T8yFmQHQgc Gi43gdG6t76M4fXb3zZaUfhN8qHaxmCXj9V4BAtk5W7H5rjMPH43r4D9shULTgrpFd1z lw5mRnttBHJyisq4VLrqDekI2FwDJ4Lw2a0DvC3KbsRPkhj6X1qucI8sB3QA628noTeI Glvf8fHf9mj30U4iZJAcj8uYvvXEnhIpgJXSH0VeDlCawjMgRE+oX7nh5m7oqn/25hno h8FQ== X-Gm-Message-State: AOAM531Mh061tTU7vmIHb7gVfkehX9mC1A77zU8YnH4szWiV7tgeAxkH LDsTPDt3bSJtgeKujMLu3u0FUsn85pE= X-Google-Smtp-Source: ABdhPJzJ/GdzBN0KhNUnDb2eOpgBZzdlpBsltzs4t40adC6QKq3bwi/wSIEdKqUmS0OX3io9Q+kbFg== X-Received: by 2002:a17:902:d3c6:: with SMTP id w6mr1669179plb.44.1644887427810; Mon, 14 Feb 2022 17:10:27 -0800 (PST) Received: from gnu-tgl-2.localdomain ([172.58.38.240]) by smtp.gmail.com with ESMTPSA id g4sm37605690pfv.63.2022.02.14.17.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 17:10:27 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 367DE300431; Mon, 14 Feb 2022 17:10:26 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH 1/2] Revert "PR28824, relro security issues, x86 keep COMMONPAGESIZE relro" Date: Mon, 14 Feb 2022 17:10:25 -0800 Message-Id: <20220215011026.738505-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3029.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Feb 2022 01:10:30 -0000 This reverts commit 31b4d3a16f200bf04db8439a63b72bba7af4e1be. --- ld/emultempl/elf-x86.em | 1 - ld/ld.h | 4 ---- ld/ldexp.c | 5 +---- ld/testsuite/ld-x86-64/pr18176.d | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ld/emultempl/elf-x86.em b/ld/emultempl/elf-x86.em index 134e4e1b616..f75521cecea 100644 --- a/ld/emultempl/elf-x86.em +++ b/ld/emultempl/elf-x86.em @@ -33,7 +33,6 @@ static struct elf_linker_x86_params params; static void elf_x86_create_output_section_statements (void) { - config.relro_use_commonpagesize = true; _bfd_elf_linker_x86_set_options (&link_info, ¶ms); } diff --git a/ld/ld.h b/ld/ld.h index c7e4ca3d334..f3086bf30de 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -276,10 +276,6 @@ typedef struct /* If set, code and non-code sections should never be in one segment. */ bool separate_code; - /* TRUE if the end of the relro segment should be aligned to - COMMONPAGESIZE rather than MAXPAGESIZE. */ - bool relro_use_commonpagesize; - /* The rpath separation character. Usually ':'. */ char rpath_separator; diff --git a/ld/ldexp.c b/ld/ldexp.c index 90760e0a8ca..c18b8284ca5 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -485,10 +485,7 @@ fold_segment_align (etree_value_type *lhs) seg->base = expld.result.value; seg->commonpagesize = commonpage; seg->maxpagesize = maxpage; - if (config.relro_use_commonpagesize) - seg->relropagesize = commonpage; - else - seg->relropagesize = maxpage; + seg->relropagesize = maxpage; seg->relro_end = 0; } else diff --git a/ld/testsuite/ld-x86-64/pr18176.d b/ld/testsuite/ld-x86-64/pr18176.d index 728c15a3dd8..a99ff15ac6b 100644 --- a/ld/testsuite/ld-x86-64/pr18176.d +++ b/ld/testsuite/ld-x86-64/pr18176.d @@ -3,7 +3,6 @@ #ld: -melf_x86_64 -shared -z relro -T pr18176.t -z max-page-size=0x200000 -z common-page-size=0x1000 $NO_DT_RELR_LDFLAGS #readelf: -l --wide #target: x86_64-*-linux* -#xfail: *-*-* #... GNU_RELRO 0x04bd17 0x000000000024bd17 0x000000000024bd17 0x0022e9 0x0022e9 R 0x1 -- 2.34.1