Check error return from bfd_canonicalize_dynamic_reloc

Since bfd_canonicalize_dynamic_reloc returns -1 on error, check it in
elf_i386_get_synthetic_symtab and elf_x86_64_get_synthetic_symtab.

	PR ld/22148
	* elf32-i386.c (elf_i386_get_synthetic_symtab): Check error
	return from bfd_canonicalize_dynamic_reloc.
	* elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise.

(cherry picked from commit 94670f6cf11fc29cc6db6814b38c4305d9bcac96)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c302aadf44e0b10f9271f4ce72d750d47d2a05f4..d08844e5695253724cde5a2602019a37335d4ad1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/22148
+       * elf32-i386.c (elf_i386_get_synthetic_symtab): Check error
+       return from bfd_canonicalize_dynamic_reloc.
+       * elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise.
+
 2017-09-15  Nick Clifton  <nickc@redhat.com>
 
        2.29.1 Release

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 00a639791305467ad3e81fcf61426b33d0959c93..5c1c3ff7907e7ae79deacdbef76dd2540377538d 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -6342,6 +6342,8 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
 
   dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
                                                dynsyms);
+  if (dynrelcount < 0)
+    return -1;
 
   /* Sort the relocs by address.  */
   qsort (dynrelbuf, dynrelcount, sizeof (arelent *), compare_relocs);

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 6bc1898a966bf2e842ac02cc4af55ccfc5cc8232..80dd791d25ca9f9e8d86cbdfc6ef62021b843f23 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -6717,6 +6717,8 @@ elf_x86_64_get_synthetic_symtab (bfd *abfd,
 
   dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
                                                dynsyms);
+  if (dynrelcount < 0)
+    return -1;
 
   /* Sort the relocs by address.  */
   qsort (dynrelbuf, dynrelcount, sizeof (arelent *), compare_relocs);