PR22067, x86 check_relocs invalid read

	PR 22067
	* elfxx-x86.h (elf_x86_hash_table): Check is_elf_hash_table first.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4190878c66dd9d48ae607b6db8a951905f97c818..958b89d273e7ef9701fad0460275e55daef70fc2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-03  Alan Modra  <amodra@gmail.com>
+
+       PR 22067
+       * elfxx-x86.h (elf_x86_hash_table): Check is_elf_hash_table first.
+
 2017-09-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Initialize

diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
index 61244f5dfe4c2dd5c9f13b5a3ca5151cb4dbe8dd..9c0dcbbe8792baa7d244d5c0a4c01ec252bbba6c 100644 (file)
--- a/bfd/elfxx-x86.h
+++ b/bfd/elfxx-x86.h
@@ -41,7 +41,8 @@
 #define ELIMINATE_COPY_RELOCS 1
 
 #define elf_x86_hash_table(p, id) \
-  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) == (id) \
+  (is_elf_hash_table ((p)->hash) \
+   && elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) == (id) \
     ? ((struct elf_x86_link_hash_table *) ((p)->hash)) : NULL)
 
 /* Is a undefined weak symbol which is resolved to 0.  Reference to an