S/390: Fix segfault when linking -shared -nostartfiles

Regression-tested on s390x.

bfd/ChangeLog:

2017-07-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	Backport from mainline
	2017-07-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* elf32-s390.c (elf_s390_finish_dynamic_sections): Add NULL
	pointer check for htab->elf.irelplt.
	* elf64-s390.c (elf_s390_finish_dynamic_sections): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a81b9824279794bb41aeb02a9745525acdc91d6d..496a5ca5565c6b72d9ecf9bfe15d2f94067661ef 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2017-07-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       Backport from mainline
+       2017-07-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * elf32-s390.c (elf_s390_finish_dynamic_sections): Add NULL
+       pointer check for htab->elf.irelplt.
+       * elf64-s390.c (elf_s390_finish_dynamic_sections): Likewise.
+
 2017-07-25  Tristan Gingold  <gingold@adacore.com>
 
        * version.m4: Bump version to 2.28.2

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index ddb6f5b255e7a2ba3e11249c54878c90dbbb676e..7f22ae1a5d80911a0e058e2ce1391dc0b524f4dd 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -3930,7 +3930,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
              break;
 
            case DT_PLTRELSZ:
-             dyn.d_un.d_val = htab->elf.srelplt->size + htab->elf.irelplt->size;
+             dyn.d_un.d_val = htab->elf.srelplt->size;
+             if (htab->elf.irelplt)
+               dyn.d_un.d_val += htab->elf.irelplt->size;
              break;
            }
 

diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index fbbf8d6e1def3f5435e73b890e8c1c613c910c3d..a59777c2df9b5b4a6f4cab1606191e0a54a608d5 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -3729,7 +3729,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
              break;
 
            case DT_PLTRELSZ:
-             dyn.d_un.d_val = htab->elf.srelplt->size + htab->elf.irelplt->size;
+             dyn.d_un.d_val = htab->elf.srelplt->size;
+             if (htab->elf.irelplt)
+               dyn.d_un.d_val += htab->elf.irelplt->size;
              break;
 
            case DT_RELASZ:
@@ -3740,7 +3742,9 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
                 linker script arranges for .rela.plt to follow all
                 other relocation sections, we don't have to worry
                 about changing the DT_RELA entry.  */
-             dyn.d_un.d_val -= htab->elf.srelplt->size + htab->elf.irelplt->size;
+             dyn.d_un.d_val -= htab->elf.srelplt->size;
+             if (htab->elf.irelplt)
+               dyn.d_un.d_val -= htab->elf.irelplt->size;
              break;
            }