From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 03C3F3858401; Wed, 23 Aug 2023 16:30:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03C3F3858401 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: H.J. Lu To: bfd-cvs@sourceware.org Subject: [binutils-gdb] x86: Fix DT_JMPREL/DT_PLTRELSZ when relocs share a section X-Act-Checkin: binutils-gdb X-Git-Author: Peter Edwards X-Git-Refname: refs/heads/master X-Git-Oldrev: c99853f48cd9132c5a745ad7452d1b0d856f32b8 X-Git-Newrev: fa4f2d46f95a1c673b025fab7f292cb864a99020 Message-Id: <20230823163031.03C3F3858401@sourceware.org> Date: Wed, 23 Aug 2023 16:30:30 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2023 16:30:31 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dfa4f2d46f95a= 1c673b025fab7f292cb864a99020 commit fa4f2d46f95a1c673b025fab7f292cb864a99020 Author: Peter Edwards Date: Tue Aug 22 19:57:28 2023 +0100 x86: Fix DT_JMPREL/DT_PLTRELSZ when relocs share a section =20 If a linker script does not place the PLT relocations and "normal" relocations in separate ELF sections, `ld` will currently output incorr= ect values for DT_JMPREL and DT_PLTRELSZ - they cover the entire ELF sectio= n, rather than just the PLT relocations =20 Don't ignore the extent of the BFD section - use the size of the srelplt BFD section and its offset from the output_secttion =20 bfd/ =20 PR ld/30787 * elfxx-x86.c (_bfd_x86_elf_finish_dynamic_sections): Use input section for DT_JMPREL and DT_PLTRELSZ. =20 ld/ =20 PR ld/30787 * testsuite/ld-i386/i386.exp: Run pr30787. * testsuite/ld-x86-64/x86-64.exp: Likewise. * testsuite/ld-i386/pr30787.d: New file. * testsuite/ld-i386/pr30787.s: Likewise. * testsuite/ld-i386/pr30787.t: Likewise. * testsuite/ld-x86-64/pr30787.d: Likewise. * testsuite/ld-x86-64/pr30787.s: Likewise. * testsuite/ld-x86-64/pr30787.t: Likewise. Diff: --- bfd/elfxx-x86.c | 5 +++-- ld/testsuite/ld-i386/i386.exp | 1 + ld/testsuite/ld-i386/pr30787.d | 7 +++++++ ld/testsuite/ld-i386/pr30787.s | 6 ++++++ ld/testsuite/ld-i386/pr30787.t | 4 ++++ ld/testsuite/ld-x86-64/pr30787.d | 7 +++++++ ld/testsuite/ld-x86-64/pr30787.s | 6 ++++++ ld/testsuite/ld-x86-64/pr30787.t | 4 ++++ ld/testsuite/ld-x86-64/x86-64.exp | 1 + 9 files changed, 39 insertions(+), 2 deletions(-) diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index f224e8f1354..103559d77ec 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2771,11 +2771,12 @@ _bfd_x86_elf_finish_dynamic_sections (bfd *output_b= fd, break; =20 case DT_JMPREL: - dyn.d_un.d_ptr =3D htab->elf.srelplt->output_section->vma; + s =3D htab->elf.srelplt; + dyn.d_un.d_ptr =3D s->output_section->vma + s->output_offset; break; =20 case DT_PLTRELSZ: - s =3D htab->elf.srelplt->output_section; + s =3D htab->elf.srelplt; dyn.d_un.d_val =3D s->size; break; =20 diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 5f53bcf29bc..e8ad973eb36 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -511,6 +511,7 @@ run_dump_test "dt-relr-1a" run_dump_test "dt-relr-1b" run_dump_test "pr28870" run_dump_test "pr28894" +run_dump_test "pr30787" =20 if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr30787.d b/ld/testsuite/ld-i386/pr30787.d new file mode 100644 index 00000000000..f82411da8b7 --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.d @@ -0,0 +1,7 @@ +#as: --32 +#ld: -melf_i386 -shared --no-warn-rwx-segments -T pr30787.t +#readelf: -d --wide + +#... + 0x0+2 \(PLTRELSZ\) +8 \(bytes\) +#pass diff --git a/ld/testsuite/ld-i386/pr30787.s b/ld/testsuite/ld-i386/pr30787.s new file mode 100644 index 00000000000..71594d2327e --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.s @@ -0,0 +1,6 @@ + .text + .globl foo +foo: + jmp bar@PLT + leal func@GOT(%ebx), %eax + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr30787.t b/ld/testsuite/ld-i386/pr30787.t new file mode 100644 index 00000000000..8c476209cba --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.t @@ -0,0 +1,4 @@ +SECTIONS +{ + .rel.dyn : { *(.rel.*) } +} diff --git a/ld/testsuite/ld-x86-64/pr30787.d b/ld/testsuite/ld-x86-64/pr30= 787.d new file mode 100644 index 00000000000..29102d4cc2c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.d @@ -0,0 +1,7 @@ +#as: --64 +#ld: -melf_x86_64 -shared --no-warn-rwx-segments -T pr30787.t +#readelf: -d --wide + +#... + 0x0+2 \(PLTRELSZ\) +24 \(bytes\) +#pass diff --git a/ld/testsuite/ld-x86-64/pr30787.s b/ld/testsuite/ld-x86-64/pr30= 787.s new file mode 100644 index 00000000000..8bc774f1312 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.s @@ -0,0 +1,6 @@ + .text + .globl foo +foo: + jmp bar@PLT + movq func@GOTPCREL(%rip), %rax + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-x86-64/pr30787.t b/ld/testsuite/ld-x86-64/pr30= 787.t new file mode 100644 index 00000000000..66759cbb6a6 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.t @@ -0,0 +1,4 @@ +SECTIONS +{ + .rela.dyn : { *(.rela.*) } +} diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86= -64.exp index 1a10c395b5c..f94284b079c 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -505,6 +505,7 @@ run_dump_test "dt-relr-1a" run_dump_test "dt-relr-1a-x32" run_dump_test "dt-relr-1b" run_dump_test "dt-relr-1b-x32" +run_dump_test "pr30787" =20 if { ![skip_sframe_tests] } { run_dump_test "sframe-simple-1"