[PATCH] D25231: [ELF] - Make checks in ObjectFile<ELFT>::getSection() stricter.
George Rimar via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 5 03:35:30 PDT 2016
grimar updated this revision to Diff 73615.
grimar added a comment.
- Addressed review comments.
https://reviews.llvm.org/D25231
Files:
ELF/InputFiles.cpp
test/ELF/invalid/Inputs/section-index2.elf
test/ELF/invalid/invalid-elf.test
Index: test/ELF/invalid/invalid-elf.test
===================================================================
--- test/ELF/invalid/invalid-elf.test
+++ test/ELF/invalid/invalid-elf.test
@@ -20,6 +20,10 @@
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX-LLD %s
# INVALID-SECTION-INDEX-LLD: invalid section index
+## section-index2.elf has local symbol with incorrect section index.
+# RUN: not ld.lld %p/Inputs/section-index2.elf -o %t2 2>&1 | \
+# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX-LLD %s
+
# RUN: not ld.lld %p/Inputs/shstrndx.so -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s
# INVALID-SECTION-INDEX: Invalid section index
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -377,17 +377,21 @@
InputSectionBase<ELFT> *
elf::ObjectFile<ELFT>::getSection(const Elf_Sym &Sym) const {
uint32_t Index = this->getSectionIndex(Sym);
- if (Index == 0)
- return nullptr;
if (Index >= Sections.size())
fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
InputSectionBase<ELFT> *S = Sections[Index];
// We found that GNU assembler 2.17.50 [FreeBSD] 2007-07-03
// could generate broken objects. STT_SECTION symbols can be
// associated with SHT_REL[A]/SHT_SYMTAB/SHT_STRTAB sections.
// In this case it is fine for section to be null here as we
// do not allocate sections of these types.
- if (!S || S == &InputSectionBase<ELFT>::Discarded)
+ if (!S) {
+ if (Index == 0 || Sym.getType() == STT_SECTION)
+ return nullptr;
+ fatal(getFilename(this) + ": invalid section index: " + Twine(Index));
+ }
+
+ if (S == &InputSectionBase<ELFT>::Discarded)
return S;
return S->Repl;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25231.73615.patch
Type: text/x-patch
Size: 1831 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161005/471fd456/attachment.bin>
More information about the llvm-commits
mailing list