From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id A24D8384770C for ; Wed, 3 Apr 2024 06:31:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A24D8384770C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A24D8384770C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712125915; cv=none; b=I8j14BgFUxD1rN3a/q2sPvqyizyvgdcSnUO77tMS/QWkFN08ncSYxuFbYcx7freZwcTLCvytrjO2hRLrSl+ov7LtPd0ow5BeGuvF5v76P55vwSOnDVVnW0DOA3S4EHtqXby6vTIqTgiDO67BbJpNovL+vF1JjQj9dGNDqD0/koo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712125915; c=relaxed/simple; bh=8KYiA87cZeSD+0dPEGgdXqN/p32d2bHbwSXi9lLw1mE=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=iDYSWCGrEt7G9EoX+3xolMP9+HwUiYDxK6cEuMBISbrtHpcSKSX51TvhSJVjyFnJWGySCKjeXLcHmPuZetSDrJ0aGm+c6H9/MHPFcdqaizDqtJbzE0jc/4vC0KyQTmd33oju/2wNozN+SfXtJ8W/SX15diGiC/lyAwjsCGF9jjk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8Dx_7vT9wxmxqsiAA--.60468S3; Wed, 03 Apr 2024 14:31:47 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxlhHR9wxmpEFyAA--.13574S2; Wed, 03 Apr 2024 14:31:46 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, cailulu@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, luweining@loongson.cn, hejinyang@loongson.cn, mengqinggang@loongson.cn Subject: [PATCH v1] LoongArch: ld: Move .got .got.plt before .data and protect .got with relro Date: Wed, 3 Apr 2024 14:31:44 +0800 Message-Id: <20240403063144.2812402-1-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:AQAAf8BxlhHR9wxmpEFyAA--.13574S2 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoWxWrW8CFyrGw4rGw1rJFy3ZFc_yoW5tFWfp3 y7Zr9YkF48J3ZrGr98G3y5ZFn3W3s7CF129a4xtF109rs5Xry8Xr40yrW3XF45Aw4DJFy0 vry0q34a9FsrJwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkFb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07j0FALUUUUU= X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_NONE,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 List-Id: Move .got .got.plt before .data so .got can be protected with -zrelro. And the first two entries of .got.plt (_dl_runtime_resolve and link map) are placed within the relro region. --- bfd/elfnn-loongarch.c | 2 ++ ld/emulparams/elf64loongarch-defs.sh | 5 ++++- ld/testsuite/ld-loongarch-elf/data-got.d | 16 ++++++++++++++++ ld/testsuite/ld-loongarch-elf/data-got.s | 6 ++++++ .../ld-loongarch-elf/ld-loongarch-elf.exp | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-loongarch-elf/data-got.d create mode 100644 ld/testsuite/ld-loongarch-elf/data-got.s diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index eb70799b06a..e8632905019 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -127,6 +127,8 @@ struct loongarch_elf_link_hash_table #define GOT_ENTRY_SIZE (LARCH_ELF_WORD_BYTES) +/* Reserve two entries of GOTPLT for ld.so, one is used for PLT + resolver _dl_runtime_resolve, the other is used for link map. */ #define GOTPLT_HEADER_SIZE (GOT_ENTRY_SIZE * 2) #define elf_backend_want_got_plt 1 diff --git a/ld/emulparams/elf64loongarch-defs.sh b/ld/emulparams/elf64loongarch-defs.sh index c793f5d8388..a8147bf71d7 100644 --- a/ld/emulparams/elf64loongarch-defs.sh +++ b/ld/emulparams/elf64loongarch-defs.sh @@ -34,6 +34,9 @@ TEXT_START_ADDR=0x120000000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -SEPARATE_GOTPLT=0 +# Put .got before .data +DATA_GOT=" " +# First two entries for PLT resolver _dl_runtime_resolve and link map. +SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 16 ? 16 : 0" INITIAL_READONLY_SECTIONS=".interp : { *(.interp) } ${CREATE_PIE-${INITIAL_READONLY_SECTIONS}}" INITIAL_READONLY_SECTIONS="${RELOCATING+${CREATE_SHLIB-${INITIAL_READONLY_SECTIONS}}}" diff --git a/ld/testsuite/ld-loongarch-elf/data-got.d b/ld/testsuite/ld-loongarch-elf/data-got.d new file mode 100644 index 00000000000..d89e0a577ff --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/data-got.d @@ -0,0 +1,16 @@ +# line 11 test the first two entries of .got.plt in relro region +# relro segment size is .dynamic size + .got size + 0x10 +# line 13 test .got .got.plt before .got +# line 15 test .got in relro segment +#as: +#ld: -shared -z relro +#readelf: -l --wide +#skip: loongarch32-*-* + +#... + GNU_RELRO 0x003c10 0x0000000000007c10 0x0000000000007c10 0x0003f0 0x0003f0 R 0x1 +#... + 01 .dynamic .got .got.plt .data +#... + 03 .dynamic .got +#pass diff --git a/ld/testsuite/ld-loongarch-elf/data-got.s b/ld/testsuite/ld-loongarch-elf/data-got.s new file mode 100644 index 00000000000..364fcf64c0e --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/data-got.s @@ -0,0 +1,6 @@ +.text +b foo +.section .got +.space 0x2a8, 4 +.data +.zero 24 diff --git a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp index 759acab80d4..c2d616b8d0a 100644 --- a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp +++ b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp @@ -133,6 +133,7 @@ if [istarget "loongarch64-*-*"] { run_dump_test "tlsdesc-dso" run_dump_test "desc-norelax" run_dump_test "desc-relax" + run_dump_test "data-got" } if [check_pie_support] { -- 2.36.0