From: Nick Clifton <nickc@redhat.com>
Date: Thu, 2 Jun 2016 15:32:45 +0000 (+0100)
Subject: Also check that the group header's sh_info field is valid.
X-Git-Tag: users/hjl/linux/release/2.26.51.0.2~1^2~29^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c09ec62dde0fa128994402ddb09c3d0dfcd35e40;p=thirdparty%2Fbinutils-gdb.git

Also check that the group header's sh_info field is valid.

	PR 20089
	* objcopy.c (group_signature): Fail if the input symbol table has
	not been loaded, or if the sh_info field of the group header is 0.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a91b99b4e7e..f8e7c769ebc 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -2,7 +2,7 @@
 
 	PR 20089
 	* objcopy.c (group_signature): Fail if the input symbol table has
-	not been loaded.
+	not been loaded, or if the sh_info field of the group header is 0.
 
 	* dwarf.c (display_debug_frames): Do not display any
 	interpretation if the block consists solely of DW__CFA_NOPs.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 98332cd3dc2..06fcea3f8b6 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1139,7 +1139,8 @@ group_signature (asection *group)
       Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
 
       if (symhdr->sh_type == SHT_SYMTAB
-	  && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
+	  && ghdr->sh_info > 0
+	  && ghdr->sh_info < (symhdr->sh_size / bed->s->sizeof_sym))
 	return isympp[ghdr->sh_info - 1];
     }
   return NULL;