This is an archive of the discontinued LLVM Phabricator instance.

Differential D25189

[Object/ELF] - Avoid possible crash in getExtendedSymbolTableIndex().
ClosedPublic

Authored by grimar on Oct 3 2016, 7:42 AM.

Details

Reviewers
davide
• rafael
Commits
rG5cbf23664d7a: [Object/ELF] - Avoid possible crash in getExtendedSymbolTableIndex().
rL283196: [Object/ELF] - Avoid possible crash in getExtendedSymbolTableIndex().
Summary

When using broken input object found using AFL,
getExtendedSymbolTableIndex() crashed because ShndxTable
was empty as object does not contain SHT_SYMTAB_SHNDX section.

Diff Detail

Repository
rL LLVM

Event Timeline

grimar updated this revision to Diff 73280.Oct 3 2016, 7:42 AM
grimar retitled this revision from to [Object/ELF] - Avoid possible crash in getExtendedSymbolTableIndex()..
grimar updated this object.
grimar added reviewers: • rafael, davide.
grimar added subscribers: llvm-commits, grimar, evgeny777.
• rafael accepted this revision.Oct 3 2016, 9:22 AM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.Oct 3 2016, 9:22 AM
Closed by commit rL283196: [Object/ELF] - Avoid possible crash in getExtendedSymbolTableIndex(). (authored by grimar). · Explain WhyOct 4 2016, 1:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
include/
llvm/
Object/
3 lines
test/
Object/
Inputs/
4 lines

Diff 73427

llvm/trunk/include/llvm/Object/ELF.h

Show First 20 Lines • Show All 219 Lines • ▼ Show 20 Lines
} }
template <class ELFT> template <class ELFT>
uint32_t ELFFile<ELFT>::getExtendedSymbolTableIndex( uint32_t ELFFile<ELFT>::getExtendedSymbolTableIndex(
const Elf_Sym *Sym, const Elf_Sym *FirstSym, const Elf_Sym *Sym, const Elf_Sym *FirstSym,
ArrayRef<Elf_Word> ShndxTable) const { ArrayRef<Elf_Word> ShndxTable) const {
assert(Sym->st_shndx == ELF::SHN_XINDEX); assert(Sym->st_shndx == ELF::SHN_XINDEX);
unsigned Index = Sym - FirstSym; unsigned Index = Sym - FirstSym;
if (Index >= ShndxTable.size())
report_fatal_error("Invalid symbol table index");
// The size of the table was checked in getSHNDXTable. // The size of the table was checked in getSHNDXTable.
return ShndxTable[Index]; return ShndxTable[Index];
} }
template <class ELFT> template <class ELFT>
ErrorOr<const typename ELFFile<ELFT>::Elf_Shdr *> ErrorOr<const typename ELFFile<ELFT>::Elf_Shdr *>
ELFFile<ELFT>::getSection(const Elf_Sym *Sym, const Elf_Shdr *SymTab, ELFFile<ELFT>::getSection(const Elf_Sym *Sym, const Elf_Shdr *SymTab,
ArrayRef<Elf_Word> ShndxTable) const { ArrayRef<Elf_Word> ShndxTable) const {
▲ Show 20 Lines • Show All 276 Lines • Show Last 20 Lines

llvm/trunk/test/Object/Inputs/invalid-ext-symtab-index.elf-x86-64

  • This is a binary file.
PropertyOld ValueNew Value
svn:mime-typenullapplication/octet-stream

llvm/trunk/test/Object/invalid.test

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
RUN: not llvm-readobj -t %p/Inputs/invalid-symbol-table-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SYMTAB-SIZE %s RUN: not llvm-readobj -t %p/Inputs/invalid-symbol-table-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SYMTAB-SIZE %s
INVALID-SYMTAB-SIZE: Invalid symbol table size INVALID-SYMTAB-SIZE: Invalid symbol table size
RUN: not llvm-readobj -t %p/Inputs/invalid-xindex-size.elf 2>&1 | FileCheck --check-prefix=INVALID-XINDEX-SIZE %s RUN: not llvm-readobj -t %p/Inputs/invalid-xindex-size.elf 2>&1 | FileCheck --check-prefix=INVALID-XINDEX-SIZE %s
INVALID-XINDEX-SIZE: Invalid data was encountered while parsing the file. INVALID-XINDEX-SIZE: Invalid data was encountered while parsing the file.
RUN: not llvm-readobj -t %p/Inputs/invalid-ext-symtab-index.elf-x86-64 2>&1 | \
RUN: FileCheck --check-prefix=INVALID-EXT-SYMTAB-INDEX %s
INVALID-EXT-SYMTAB-INDEX: Invalid symbol table index