From 1ef692ea23714876cc30b1a3ab3ef33a1369f17a Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Tue, 1 Aug 2017 15:13:40 +0200 Subject: [PATCH] S/390: Fix claimfile failures This fixes a segfault when trying to access the local_plt field in the s390 specific elf data althoug the underlaying object is a generic elf object. This fixes the following testsuite failures: < FAIL: plugin claimfile replace symbol with source < FAIL: plugin claimfile resolve symbol with source < FAIL: plugin claimfile replace file with source < FAIL: plugin set symbol visibility with source < FAIL: plugin ignore lib with source < FAIL: plugin claimfile replace lib with source < FAIL: plugin 2 with source lib < FAIL: load plugin 2 with source < FAIL: plugin 3 with source lib < FAIL: load plugin 3 with source bfd/ChangeLog: 2017-08-01 Andreas Krebbel * elf32-s390.c (elf_s390_finish_dynamic_sections): Skip if it isn't the S/390 specific elf data. * elf64-s390.c (elf_s390_finish_dynamic_sections): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-s390.c | 3 +++ bfd/elf64-s390.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1c0c65b58cf..d7d53d6022f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-08-01 Andreas Krebbel + + * elf32-s390.c (elf_s390_finish_dynamic_sections): Skip if it + isn't the S/390 specific elf data. + * elf64-s390.c (elf_s390_finish_dynamic_sections): Likewise. + 2017-07-31 Kuan-Lin Chen * elfxx-riscv.c (riscv_elf_add_sub_reloc): New function. diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 95682b659eb..91853ef2b44 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -4001,6 +4001,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd, symtab_hdr = &elf_symtab_hdr (ibfd); + if (!is_s390_elf (ibfd)) + continue; + local_plt = elf_s390_local_plt (ibfd); if (local_plt != NULL) for (i = 0; i < symtab_hdr->sh_info; i++) diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 8c5b1970d52..73d0331f8e4 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -3814,6 +3814,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd, symtab_hdr = &elf_symtab_hdr (ibfd); + if (!is_s390_elf (ibfd)) + continue; + local_plt = elf_s390_local_plt (ibfd); if (local_plt != NULL) for (i = 0; i < symtab_hdr->sh_info; i++) -- 2.30.2