PR26483, ASAN: ppc_elf_link_params elf32-ppc.c:2314

	PR 26483
	* elf32-ppc.c (ppc_elf_hash_table): Test is_elf_hash_table before
	accessing elf_hash_table_id.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b068c3891aba0379bad1f15418b024f58ed90d9e..aae0c4d02a58b06552005a88f8a081661609b9b2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2020-08-25  Alan Modra  <amodra@gmail.com>
+
+       PR 26483
+       * elf32-ppc.c (ppc_elf_hash_table): Test is_elf_hash_table before
+       accessing elf_hash_table_id.
+
 2020-08-24  Mark Wielaard  <mark@klomp.org>
 
        * dwarf2.c (read_attribute_value): Handle DW_FORM_data16.

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 43c0e18896767aab4b55e051ed82b1a46b136c38..66265ef6009ef69d2450449ea1b9ac861baa58b7 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -2230,8 +2230,9 @@ struct ppc_elf_link_hash_table
 /* Get the PPC ELF linker hash table from a link_info structure.  */
 
 #define ppc_elf_hash_table(p) \
-  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
-  == PPC32_ELF_DATA ? ((struct ppc_elf_link_hash_table *) ((p)->hash)) : NULL)
+  ((is_elf_hash_table ((p)->hash)                                      \
+    && elf_hash_table_id (elf_hash_table (p)) == PPC32_ELF_DATA)       \
+   ? (struct ppc_elf_link_hash_table *) (p)->hash : NULL)
 
 /* Create an entry in a PPC ELF linker hash table.  */