6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 20:23:59 +00:00
Code Issues Projects Releases Wiki Activity

[Object, MachO] Don't crash on invalid MachO segment load commands.

Browse Source 
Summary:
Properly report the error in segment load commands from MachOObjectFile
constructor instead of crashing the program.

Adjust the test case accordingly.

Test Plan: regression test suite

Reviewers: rafael, filcab

Subscribers: llvm-commits

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239081 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov
2015-06-04 20:08:52 +00:00
parent 7e699dce03
commit 5400980e1e
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Object/MachOObjectFile.cpp
View File

@ -66,17 +66,16 @@ static ErrorOr<T> getStructOrErr(const MachOObjectFile *O, const char *P) {
}
template <typename SegmentCmd>
static uint32_t getSegmentLoadCommandNumSections(const SegmentCmd &S,
uint32_t Cmdsize) {
static ErrorOr<uint32_t> getSegmentLoadCommandNumSections(const SegmentCmd &S,
uint32_t Cmdsize) {
const unsigned SectionSize = sizeof(SegmentCmd);
if (S.nsects > std::numeric_limits<uint32_t>::max() / SectionSize ||
S.nsects * SectionSize > Cmdsize - sizeof(S))
report_fatal_error(
"Number of sections too large for size of load command.");
return object_error::macho_load_segment_too_many_sections;
return S.nsects;
}
static uint32_t
static ErrorOr<uint32_t>
getSegmentLoadCommandNumSections(const MachOObjectFile *O,
const MachOObjectFile::LoadCommandInfo &L) {
if (O->is64Bit())
@ -306,14 +305,19 @@ MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian,
}
UuidLoadCmd = Load.Ptr;
} else if (Load.C.cmd == SegmentLoadType) {
const unsigned SegmentLoadSize = this->is64Bit()
const unsigned SegmentLoadSize = is64Bit()
? sizeof(MachO::segment_command_64)
: sizeof(MachO::segment_command);
if (Load.C.cmdsize < SegmentLoadSize)
report_fatal_error("Segment load command size is too small.");
uint32_t NumSections = getSegmentLoadCommandNumSections(this, Load);
for (unsigned J = 0; J < NumSections; ++J) {
if (Load.C.cmdsize < SegmentLoadSize) {
EC = object_error::macho_load_segment_too_small;
return;
}
auto NumSectionsOrErr = getSegmentLoadCommandNumSections(this, Load);
if (!NumSectionsOrErr) {
EC = NumSectionsOrErr.getError();
return;
}
for (unsigned J = 0; J < NumSectionsOrErr.get(); ++J) {
const char *Sec = getSectionPtr(this, Load, J);
Sections.push_back(Sec);
}