This is an archive of the discontinued LLVM Phabricator instance.

Differential D25229

[ELF] - Do not hang if broken object has option descriptor in .MIPS.options with size of zero.
ClosedPublic

Authored by grimar on Oct 4 2016, 3:23 AM.

Details

Reviewers
ruiu
davide
• rafael
atanasyan
Commits
rG422e47a9f508: [ELF] - Do not hang if broken object has option descriptor in .MIPS.options…
rLLD283208: [ELF] - Do not hang if broken object has option descriptor in .MIPS.options…
rL283208: [ELF] - Do not hang if broken object has option descriptor in .MIPS.options…
Summary

Previously lld would hang in infinite loop in this case,
patch fixes the issue. Object was found during AFL run.

Diff Detail

Repository
rL LLVM

Event Timeline

grimar updated this revision to Diff 73441.Oct 4 2016, 3:23 AM
grimar retitled this revision from to [ELF] - Do not hang if broken object has option descriptor in .MIPS.options with size of zero..
grimar updated this object.
grimar added reviewers: ruiu, • rafael, atanasyan, davide.
grimar added subscribers: llvm-commits, grimar, evgeny777.
Herald added a subscriber: sdardis. · View Herald TranscriptOct 4 2016, 3:23 AM
atanasyan accepted this revision.Oct 4 2016, 3:28 AM
atanasyan edited edge metadata.

LGTM

Thanks!

This revision is now accepted and ready to land.Oct 4 2016, 3:28 AM
Closed by commit rL283208: [ELF] - Do not hang if broken object has option descriptor in .MIPS.options… (authored by grimar). · Explain WhyOct 4 2016, 3:32 AM
This revision was automatically updated to reflect the committed changes.
grimar mentioned this in rLLD358972: [LLD][ELF] - Fix mips-invalid-options-descriptor.s test case and convert to….Apr 23 2019, 4:20 AM
grimar mentioned this in rL358972: [LLD][ELF] - Fix mips-invalid-options-descriptor.s test case and convert to….
grimar mentioned this in rG6684a351ed43: [LLD][ELF] - Fix mips-invalid-options-descriptor.s test case and convert to….

Revision Contents

PathSize
lld/
trunk/
ELF/
2 lines
test/
ELF/
invalid/
Inputs/
5 lines

Diff 73444

lld/trunk/ELF/InputSection.cpp

Show First 20 Lines • Show All 688 Lines • ▼ Show 20 Lines while (!D.empty()) {
} }
auto *O = reinterpret_cast<const Elf_Mips_Options<ELFT> *>(D.data()); auto *O = reinterpret_cast<const Elf_Mips_Options<ELFT> *>(D.data());
if (O->kind == ODK_REGINFO) { if (O->kind == ODK_REGINFO) {
Reginfo = &O->getRegInfo(); Reginfo = &O->getRegInfo();
if (Config->Relocatable && Reginfo->ri_gp_value) if (Config->Relocatable && Reginfo->ri_gp_value)
error(getName(this) + ": unsupported non-zero ri_gp_value"); error(getName(this) + ": unsupported non-zero ri_gp_value");
break; break;
} }
if (!O->size)
fatal(getName(this) + ": zero option descriptor size");
D = D.slice(O->size); D = D.slice(O->size);
} }
} }
template <class ELFT> template <class ELFT>
bool MipsOptionsInputSection<ELFT>::classof(const InputSectionBase<ELFT> *S) { bool MipsOptionsInputSection<ELFT>::classof(const InputSectionBase<ELFT> *S) {
return S->kind() == InputSectionBase<ELFT>::MipsOptions; return S->kind() == InputSectionBase<ELFT>::MipsOptions;
} }
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines

lld/trunk/test/ELF/invalid/Inputs/mips-invalid-options-descriptor.elf

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

lld/trunk/test/ELF/invalid/mips-invalid-options-descriptor.s

## mips-invalid-options-descriptor.elf has option descriptor in
## .MIPS.options with size of zero.
# RUN: not ld.lld %p/Inputs/mips-invalid-options-descriptor.elf -o %t2 2>&1 | \
# RUN: FileCheck %s
# CHECK: zero option descriptor size