Fix seg-fault in strip when copying a corrupt binary.

	PR binutils/20931
	* elf.c (copy_special_section_fields): Check for an invalid
	sh_link field before attempting to follow it.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fb3f3f41f7cdefd25d6b5fac4741dcbe7261c29b..26fb42b8e44f17f9fae9b97661c240af5c8ed652 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 2016-12-06  Nick Clifton  <nickc@redhat.com>
 
+       PR binutils/20931
+       * elf.c (copy_special_section_fields): Check for an invalid
+       sh_link field before attempting to follow it.
+
        PR binutils/20929
        * aoutx.h (squirt_out_relocs): Check for relocs without an
        associated symbol.

diff --git a/bfd/elf.c b/bfd/elf.c
index 5cfee9c58f77c3b70648e2979419367844b630b4..678c0430d2659a0c8242d537af6a4526d82a8ec7 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1346,6 +1346,16 @@ copy_special_section_fields (const bfd *ibfd,
      in the input bfd.  */
   if (iheader->sh_link != SHN_UNDEF)
     {
+      /* See PR 20931 for a reproducer.  */
+      if (iheader->sh_link >= elf_numsections (ibfd))
+       {
+         (* _bfd_error_handler)
+           /* xgettext:c-format */
+           (_("%B: Invalid sh_link field (%d) in section number %d"),
+            ibfd, iheader->sh_link, secnum);
+         return FALSE;
+       }
+
       sh_link = find_link (obfd, iheaders[iheader->sh_link], iheader->sh_link);
       if (sh_link != SHN_UNDEF)
        {