This is an archive of the discontinued LLVM Phabricator instance.

Differential D25091

[Object/ELF] - Do not crash if string table sh_size is equal to zero.
ClosedPublic

Authored by grimar on Sep 30 2016, 4:57 AM.

Details

Reviewers
davide
• rafael
Commits
rG3fb09b3a9e52: [Object/ELF] - Do not crash if string table sh_size is equal to zero.
rL285282: [Object/ELF] - Do not crash if string table sh_size is equal to zero.
Summary

Revealed using "id_000038,sig_11,src_000015,op_havoc,rep_16" from PR30540,
when sh_size was 0, crash happened.

Diff Detail

Event Timeline

grimar updated this revision to Diff 73038.Sep 30 2016, 4:57 AM
grimar retitled this revision from to [Object/ELF] - Do not crash if string table sh_size is equal to zero..
grimar updated this object.
grimar added reviewers: • rafael, davide.
grimar added subscribers: llvm-commits, grimar, evgeny777.
grimar added a comment.Oct 6 2016, 3:30 AM

Ping.

grimar updated this revision to Diff 74118.Oct 10 2016, 5:28 AM
  • Rebased.
• rafael accepted this revision.Oct 26 2016, 2:42 PM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.Oct 26 2016, 2:42 PM
Closed by commit rL285282: [Object/ELF] - Do not crash if string table sh_size is equal to zero. (authored by grimar). · Explain WhyOct 27 2016, 4:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
llvm/
Object/
2 lines
test/
Object/
Inputs/
1 line

Diff 74118

include/llvm/Object/ELF.h

Show First 20 Lines • Show All 409 Lines • ▼ Show 20 Lines
ErrorOr<StringRef> ErrorOr<StringRef>
ELFFile<ELFT>::getStringTable(const Elf_Shdr *Section) const { ELFFile<ELFT>::getStringTable(const Elf_Shdr *Section) const {
if (Section->sh_type != ELF::SHT_STRTAB) if (Section->sh_type != ELF::SHT_STRTAB)
return object_error::parse_failed; return object_error::parse_failed;
auto V = getSectionContentsAsArray<char>(Section); auto V = getSectionContentsAsArray<char>(Section);
if (std::error_code EC = V.getError()) if (std::error_code EC = V.getError())
return EC; return EC;
ArrayRef<char> Data = *V; ArrayRef<char> Data = *V;
if (Data.empty())
return object_error::parse_failed;
if (Data.back() != '\0') if (Data.back() != '\0')
return object_error::string_table_non_null_end; return object_error::string_table_non_null_end;
return StringRef(Data.begin(), Data.size()); return StringRef(Data.begin(), Data.size());
} }
template <class ELFT> template <class ELFT>
ErrorOr<ArrayRef<typename ELFFile<ELFT>::Elf_Word>> ErrorOr<ArrayRef<typename ELFFile<ELFT>::Elf_Word>>
ELFFile<ELFT>::getSHNDXTable(const Elf_Shdr &Section) const { ELFFile<ELFT>::getSHNDXTable(const Elf_Shdr &Section) const {
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

test/Object/Inputs/invalid-strtab-zero-size.elf

  • This is a binary file.
PropertyOld ValueNew Value
svn:mime-typenullapplication/octet-stream
\ No newline at end of property

test/Object/invalid.test

RUN: not llvm-dwarfdump %p/Inputs/invalid-bad-rel-type.elf 2>&1 | FileCheck %s RUN: not llvm-dwarfdump %p/Inputs/invalid-bad-rel-type.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-type.elf 2>&1 | FileCheck %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-type.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-size.elf 2>&1 | FileCheck %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-size.elf 2>&1 | FileCheck %s
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-zero-size.elf 2>&1 | FileCheck %s
CHECK: Invalid data was encountered while parsing the file CHECK: Invalid data was encountered while parsing the file
RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-non-null.elf 2>&1 | FileCheck --check-prefix=NON-NULL %s RUN: not llvm-objdump -s %p/Inputs/invalid-strtab-non-null.elf 2>&1 | FileCheck --check-prefix=NON-NULL %s
NON-NULL: String table must end with a null terminator NON-NULL: String table must end with a null terminator
Test the sh_entsize are invalid Test the sh_entsize are invalid
RUN: llvm-readobj -s %p/Inputs/invalid-sh_entsize.elf | FileCheck --check-prefix=SECTION %s RUN: llvm-readobj -s %p/Inputs/invalid-sh_entsize.elf | FileCheck --check-prefix=SECTION %s
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines