asan: segfault in coff_mangle_symbols

The testcase managed to trigger creation of a wild pointer in
coff_slurp_symbol_table.  Stop that happening, and fix an unrelated
problem I happened to see in bfd_coff_get_syment.

	* coff-bfd.c (bfd_coff_get_syment): Clear fix_value after
	converting n_value from a pointer to an index.
	* coffcode.h (coff_slurp_symbol_table <C_BSTAT>): Sanity check
	symbol value before converting to a pointer.

diff --git a/bfd/coff-bfd.c b/bfd/coff-bfd.c
index 292778ecb56702c2ab7eda81a6560fe9fedbf567..9aceeb080a7f21c5e4767202c0672c476a782673 100644 (file)
--- a/bfd/coff-bfd.c
+++ b/bfd/coff-bfd.c
@@ -45,9 +45,12 @@ bfd_coff_get_syment (bfd *abfd,
   *psyment = csym->native->u.syment;
 
   if (csym->native->fix_value)
-    psyment->n_value =
-      ((psyment->n_value - (uintptr_t) obj_raw_syments (abfd))
-       / sizeof (combined_entry_type));
+    {
+      psyment->n_value =
+       ((psyment->n_value - (uintptr_t) obj_raw_syments (abfd))
+        / sizeof (combined_entry_type));
+      csym->native->fix_value = 0;
+    }
 
   /* FIXME: We should handle fix_line here.  */
 

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 423f6c070ef5cd831a78511f59df8db0d94050a3..594f3e0457b0bd2759fa23de0ba0bc8143081bd9 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -4852,13 +4852,18 @@ coff_slurp_symbol_table (bfd * abfd)
            case C_BSTAT:
              dst->symbol.flags = BSF_DEBUGGING;
 
-             /* The value is actually a symbol index.  Save a pointer
-                to the symbol instead of the index.  FIXME: This
-                should use a union.  */
-             src->u.syment.n_value
-               = (uintptr_t) (native_symbols + src->u.syment.n_value);
-             dst->symbol.value = src->u.syment.n_value;
-             src->fix_value = 1;
+             if (src->u.syment.n_value >= obj_raw_syment_count (abfd))
+               dst->symbol.value = 0;
+             else
+               {
+                 /* The value is actually a symbol index.  Save a pointer
+                    to the symbol instead of the index.  FIXME: This
+                    should use a union.  */
+                 src->u.syment.n_value
+                   = (uintptr_t) (native_symbols + src->u.syment.n_value);
+                 dst->symbol.value = src->u.syment.n_value;
+                 src->fix_value = 1;
+               }
              break;
 #endif