diff mbox series

elf: Check DT_SYMTAB only on non-IR object

Message ID 20230830155508.549330-1-hjl.tools@gmail.com
State New
Headers
Series elf: Check DT_SYMTAB only on non-IR object |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

H.J. Lu Aug. 30, 2023, 3:55 p.m. UTC 
  Check DT_SYMTAB only on non-IR object of archive member to avoid crash
on LLVM IR object with NULL elf_tdata.

	PR ld/30811
	* elflink.c (elf_link_is_defined_archive_symbol): Check
	DT_SYMTAB only on non-IR object.
---
 bfd/elflink.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Comments

Alan Modra Aug. 30, 2023, 11:47 p.m. UTC | #1 
On Wed, Aug 30, 2023 at 08:55:08AM -0700, H.J. Lu via Binutils wrote:
> Check DT_SYMTAB only on non-IR object of archive member to avoid crash
> on LLVM IR object with NULL elf_tdata.
> 
> 	PR ld/30811
> 	* elflink.c (elf_link_is_defined_archive_symbol): Check
> 	DT_SYMTAB only on non-IR object.

Looks good.  Thanks.
diff mbox series

Patch

diff --git a/bfd/elflink.c b/bfd/elflink.c
index c4f286e3d90..ca162145f7e 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -3571,12 +3571,6 @@  elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef)
   if (! bfd_check_format (abfd, bfd_object))
     return false;
 
-  if (elf_use_dt_symtab_p (abfd))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
   /* Select the appropriate symbol table.  If we don't know if the
      object file is an IR object, give linker LTO plugin a chance to
      get the correct symbol table.  */
@@ -3592,10 +3586,19 @@  elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef)
       abfd = abfd->plugin_dummy_bfd;
       hdr = &elf_tdata (abfd)->symtab_hdr;
     }
-  else if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
-    hdr = &elf_tdata (abfd)->symtab_hdr;
   else
-    hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+    {
+      if (elf_use_dt_symtab_p (abfd))
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return false;
+	}
+
+      if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
+	hdr = &elf_tdata (abfd)->symtab_hdr;
+      else
+	hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+    }
 
   symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;