From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id 4759C3858437 for ; Tue, 20 Sep 2022 06:10:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4759C3858437 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=xry111.site Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xry111.site DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1663654210; bh=Cq/ChgCi/QoR5WZtTzQzK7s/kLJrzulAEanUXbv88fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O5UMCX3KoLgNWsRoDoirhgYD8GHcSUhhOJ6F9au67tAyN9TsASPGI7ciZANXympH3 B+WyCCx3Sf02nteWrrME7z7aIJ4zLI2Qp+fx7SPASMnSVScLeCdlZltnlVVEdTacin 7H/sMNn3pyQ6SZOf/jwiuEeSOwMehL+4laXLn1t4= Received: from xry111-x57s1.. (unknown [IPv6:240e:358:1109:8900:dc73:854d:832e:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 449AB6695E; Tue, 20 Sep 2022 02:10:05 -0400 (EDT) From: Xi Ruoyao To: binutils@sourceware.org Cc: liuzhensong , Lulu Cheng , Wang Xuerui , Chenghua Xu , Xi Ruoyao Subject: [PATCH v2 2/2] LoongArch: Fix R_LARCH_IRELATIVE insertion after elf_link_sort_relocs Date: Tue, 20 Sep 2022 14:09:30 +0800 Message-Id: <20220920060930.33357-3-xry111@xry111.site> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920060930.33357-1-xry111@xry111.site> References: <20220920060930.33357-1-xry111@xry111.site> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD,GIT_PATCH_0,LIKELY_SPAM_FROM,SPF_HELO_PASS,SPF_PASS,TXREP,T_PDS_OTHER_BAD_TLD 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: loongarch_elf_finish_dynamic_symbol is called after elf_link_sort_relocs if -z combreloc. elf_link_sort_relocs redistributes the contents of .rela.* sections those would be merged into .rela.dyn, so the slot for R_LARCH_IRELATIVE may be out of relplt->contents now. To make things worse, the boundary check dyn < dyn + relplt->size / sizeof (*dyn) is obviously wrong ("x + 10 < x"? :), causing the issue undetected during the linking process and the resulted executable suddenly crashes at runtime. The issue was found during an attempt to add static-pie support to the toolchain. Fix it by iterating through the inputs of .rela.dyn to find the slot. --- bfd/elfnn-loongarch.c | 41 +++++++++++-------- .../ld-loongarch-elf/ld-loongarch-elf.exp | 1 + .../ld-loongarch-elf/local-ifunc-reloc.d | 12 ++++++ .../ld-loongarch-elf/local-ifunc-reloc.s | 28 +++++++++++++ 4 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.d create mode 100644 ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.s diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index af18a8a0168..33c85e5207c 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3514,6 +3514,12 @@ loongarch_elf_finish_dynamic_symbol (bfd *output_bfd, { struct loongarch_elf_link_hash_table *htab = loongarch_elf_hash_table (info); const struct elf_backend_data *bed = get_elf_backend_data (output_bfd); + asection *rela_dyn = bfd_get_section_by_name (output_bfd, ".rela.dyn"); + struct bfd_link_order *lo = NULL; + Elf_Internal_Rela *slot = NULL, *last_slot = NULL; + + if (rela_dyn) + lo = rela_dyn->map_head.link_order; if (h->plt.offset != MINUS_ONE) { @@ -3523,6 +3529,7 @@ loongarch_elf_finish_dynamic_symbol (bfd *output_bfd, uint32_t plt_entry[PLT_ENTRY_INSNS]; bfd_byte *loc; Elf_Internal_Rela rela; + asection *rela_sec = NULL; if (htab->elf.splt) { @@ -3575,31 +3582,31 @@ loongarch_elf_finish_dynamic_symbol (bfd *output_bfd, && (relplt == htab->elf.srelgot || relplt == htab->elf.irelplt)) { - { - rela.r_info = ELFNN_R_INFO (0, R_LARCH_IRELATIVE); - rela.r_addend = (h->root.u.def.value + rela.r_info = ELFNN_R_INFO (0, R_LARCH_IRELATIVE); + rela.r_addend = (h->root.u.def.value + h->root.u.def.section->output_section->vma + h->root.u.def.section->output_offset); - } - /* Find the space after dyn sort. */ + /* Find the space after dyn sort. */ + while (slot == last_slot || slot->r_offset != 0) { - Elf_Internal_Rela *dyn = (Elf_Internal_Rela *)relplt->contents; - bool fill = false; - for (;dyn < dyn + relplt->size / sizeof (*dyn); dyn++) + if (slot != last_slot) { - if (0 == dyn->r_offset) - { - bed->s->swap_reloca_out (output_bfd, &rela, - (bfd_byte *)dyn); - relplt->reloc_count++; - fill = true; - break; - } + slot++; + continue; } - BFD_ASSERT (fill); + + BFD_ASSERT (lo != NULL); + rela_sec = lo->u.indirect.section; + lo = lo->next; + + slot = (Elf_Internal_Rela *)rela_sec->contents; + last_slot = (Elf_Internal_Rela *)(rela_sec->contents + + rela_sec->size); } + bed->s->swap_reloca_out (output_bfd, &rela, (bfd_byte *)slot); + rela_sec->reloc_count++; } else { diff --git a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp index dfa8ee18865..726ee823701 100644 --- a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp +++ b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp @@ -31,6 +31,7 @@ if [istarget "loongarch64-*-*"] { run_dump_test "macro_op" run_dump_test "syscall" run_dump_test "disas-jirl" + run_dump_test "local-ifunc-reloc" } if [istarget "loongarch32-*-*"] { diff --git a/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.d b/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.d new file mode 100644 index 00000000000..d7cadb8c527 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.d @@ -0,0 +1,12 @@ +#as: +#ld: -shared -z combreloc +#objdump: -R + +.*: +file format .* + +DYNAMIC RELOCATION RECORDS +OFFSET +TYPE +VALUE +[[:xdigit:]]+ R_LARCH_IRELATIVE +\*ABS\*\+0x[[:xdigit:]]+ +[[:xdigit:]]+ R_LARCH_64 +test + + diff --git a/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.s b/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.s new file mode 100644 index 00000000000..77c487463f5 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/local-ifunc-reloc.s @@ -0,0 +1,28 @@ +.text +.align 2 + +.local ifunc +.type ifunc, @gnu_indirect_function +.set ifunc, resolver + +resolver: + la.local $a0, impl + jr $ra + +impl: + li.w $a0, 42 + jr $ra + +.global test +.type test, @function +test: + move $s0, $ra + bl ifunc + xori $a0, $a0, 42 + jr $s0 + +.data +.global ptr +.type ptr, @object +ptr: + .dword test -- 2.37.0