[PATCH] D25609: [ELF] - Don't crash on multiple SHT_MIPS_REGINFO/SHT_MIPS_ABIFLAGS sections.

[George Rimar via llvm-commits]

grimar created this revision.
grimar added reviewers: ruiu, atanasyan.
grimar added subscribers: llvm-commits, grimar, evgeny777.
Herald added a subscriber: sdardis.

In continue of https://reviews.llvm.org/D25555, this patch fixes possible crash when
we have multiple SHT_MIPS_REGINFO or SHT_MIPS_ABIFLAGS sections.
yaml2obj was used to produce such objects.


https://reviews.llvm.org/D25609

Files:
  ELF/InputFiles.cpp
  test/ELF/invalid/mips-multiple-abiflags.test
  test/ELF/invalid/mips-multiple-reginfo.test


Index: test/ELF/invalid/mips-multiple-reginfo.test
===================================================================
--- test/ELF/invalid/mips-multiple-reginfo.test
+++ test/ELF/invalid/mips-multiple-reginfo.test
@@ -0,0 +1,25 @@
+# RUN: yaml2obj %s -o %t
+# RUN: not ld.lld %t -o %tout 2>&1 | FileCheck %s
+
+--- !ELF
+FileHeader:
+  Class:    ELFCLASS32
+  Data:     ELFDATA2LSB
+  Type:     ET_REL
+  Machine:  EM_MIPS
+  Flags:    [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
+Sections:
+  - Name:          .foo1
+    Type:          SHT_MIPS_REGINFO
+    Flags:         [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:  16
+    Content:       "000000000000000000000000000000000000000000000000"
+
+  - Name:          .foo2
+    Type:          SHT_MIPS_REGINFO
+    Flags:         [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:  16
+    Content:       "000000000000000000000000000000000000000000000000"
+
+# CHECK: multiple SHT_MIPS_REGINFO sections are not allowed
Index: test/ELF/invalid/mips-multiple-abiflags.test
===================================================================
--- test/ELF/invalid/mips-multiple-abiflags.test
+++ test/ELF/invalid/mips-multiple-abiflags.test
@@ -0,0 +1,21 @@
+# RUN: yaml2obj %s -o %t
+# RUN: not ld.lld %t -o %tout 2>&1 | FileCheck %s
+
+--- !ELF
+FileHeader:
+  Class:    ELFCLASS32
+  Data:     ELFDATA2LSB
+  Type:     ET_REL
+  Machine:  EM_MIPS
+  Flags:    [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32]
+
+Sections:
+  - Name:          .foo1
+    Type:          SHT_MIPS_ABIFLAGS
+    ISA:           MIPS64
+
+  - Name:          .foo2
+    Type:          SHT_MIPS_ABIFLAGS
+    ISA:           MIPS64
+
+# CHECK: multiple SHT_MIPS_ABIFLAGS sections are not allowed
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -321,6 +321,9 @@
     // they can be used to reason about object compatibility.
     return &InputSection<ELFT>::Discarded;
   case SHT_MIPS_REGINFO:
+    if (MipsReginfo)
+      fatal(getFilename(this) +
+            ": multiple SHT_MIPS_REGINFO sections are not allowed");
     MipsReginfo.reset(new MipsReginfoInputSection<ELFT>(this, &Sec, Name));
     return MipsReginfo.get();
   case SHT_MIPS_OPTIONS:
@@ -330,6 +333,9 @@
     MipsOptions.reset(new MipsOptionsInputSection<ELFT>(this, &Sec, Name));
     return MipsOptions.get();
   case SHT_MIPS_ABIFLAGS:
+    if (MipsAbiFlags)
+      fatal(getFilename(this) +
+            ": multiple SHT_MIPS_ABIFLAGS sections are not allowed");
     MipsAbiFlags.reset(new MipsAbiFlagsInputSection<ELFT>(this, &Sec, Name));
     return MipsAbiFlags.get();
   case SHT_RELA:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25609.74662.patch
Type: text/x-patch
Size: 2715 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161014/7c4cacc5/attachment.bin>