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

Regression-tested on s390x.

bfd/ChangeLog:

2017-08-01  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 1478710263cd0f89ef063aebcebf3a2a48703e61..103334d34e096775eb75b7b30f55d8195ff0bc85 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-01  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-31  Alan Modra  <amodra@gmail.com>
 
        * elf64-ppc.c (ppc64_elf_tls_setup): Warn on --plt-localentry

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index c26bdcf900a666b4a267372674edabc4570bc2ab..8adf9e4784898aae791fe9bf32cf4ceac4d1f6fc 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -3941,7 +3941,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 f85f8cd7489ffb98ff05a90cd75370b455b445bf..4dfa007cc8bb658dc6ca38a7e41db007561671d7 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -3745,7 +3745,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:
@@ -3756,7 +3758,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;
            }