intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-31 16:29:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] - Make checks in ObjectFile<ELFT>::getSection() stricter.

Browse Source 
This patch makes the check for null section stricter, 
so it is only allowed for STT_SECTION symbols now.

Differential revision: https://reviews.llvm.org/D25231

llvm-svn: 283426
This commit is contained in:
George Rimar
2016-10-06 09:17:55 +00:00
parent 9abbeaad55
commit 24adce95b2
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/InputFiles.cpp
View File

@@ -377,17 +377,22 @@ template <class ELFT>
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;
}

BIN
lld/test/ELF/invalid/Inputs/section-index2.elf Normal file
View File

Binary file not shown.

4
lld/test/ELF/invalid/invalid-elf.test
View File

@@ -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