Bug 23142, SIGSEGV in is_strip_section

	PR 23142
	* objcopy.c (group_signature): Don't accept groups that use a
	symbol table other than the one we've read.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 61bbd2f6295a19acb2f81c640646859d4960268a..29fd1c247ce1f470b766e32a48b175a43c5aace7 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-07  Alan Modra  <amodra@gmail.com>
+
+       PR 23142
+       * objcopy.c (group_signature): Don't accept groups that use a
+       symbol table other than the one we've read.
+
 2018-04-30  Francois H. Theron <francois.theron@netronome.com>
 
        * readelf.c: Very basic support for EM_NFP and its section types.

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 61c513b482dc89f66541889f947b951d4250555a..fadc9572433bca8bb083b72f06022eddf6242e66 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1211,14 +1211,13 @@ group_signature (asection *group)
     return NULL;
 
   ghdr = &elf_section_data (group)->this_hdr;
-  if (ghdr->sh_link < elf_numsections (abfd))
+  if (ghdr->sh_link == elf_onesymtab (abfd))
     {
       const struct elf_backend_data *bed = get_elf_backend_data (abfd);
-      Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
+      Elf_Internal_Shdr *symhdr = &elf_symtab_hdr (abfd);
 
-      if (symhdr->sh_type == SHT_SYMTAB
-         && ghdr->sh_info > 0
-         && ghdr->sh_info < (symhdr->sh_size / bed->s->sizeof_sym))
+      if (ghdr->sh_info > 0
+         && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
        return isympp[ghdr->sh_info - 1];
     }
   return NULL;