summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Object/MachOObjectFile.cpp33
-rw-r--r--llvm/test/Object/Inputs/macho-invalid-headerbin0 -> 24 bytes
-rw-r--r--llvm/test/Object/macho-invalid.test3
3 files changed, 32 insertions, 4 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index 1620c1a6a91..c1d13838444 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -38,6 +38,7 @@ namespace {
};
}
+// FIXME: Replace all uses of this function with getStructOrErr.
template <typename T>
static T getStruct(const MachOObjectFile *O, const char *P) {
// Don't read before the beginning or past the end of the file
@@ -51,6 +52,19 @@ static T getStruct(const MachOObjectFile *O, const char *P) {
return Cmd;
}
+template <typename T>
+static ErrorOr<T> getStructOrErr(const MachOObjectFile *O, const char *P) {
+ // Don't read before the beginning or past the end of the file
+ if (P < O->getData().begin() || P + sizeof(T) > O->getData().end())
+ return object_error::parse_failed;
+
+ T Cmd;
+ memcpy(&Cmd, P, sizeof(T));
+ if (O->isLittleEndian() != sys::IsLittleEndianHost)
+ MachO::swapStruct(Cmd);
+ return Cmd;
+}
+
template <typename SegmentCmd>
static uint32_t getSegmentLoadCommandNumSections(const SegmentCmd &S,
uint32_t Cmdsize) {
@@ -203,6 +217,16 @@ getNextLoadCommandInfo(const MachOObjectFile *Obj,
return getLoadCommandInfo(Obj, L.Ptr + L.C.cmdsize);
}
+template <typename T>
+static void parseHeader(const MachOObjectFile *Obj, T &Header,
+ std::error_code &EC) {
+ auto HeaderOrErr = getStructOrErr<T>(Obj, getPtr(Obj, 0));
+ if (HeaderOrErr)
+ Header = HeaderOrErr.get();
+ else
+ EC = HeaderOrErr.getError();
+}
+
MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian,
bool Is64bits, std::error_code &EC)
: ObjectFile(getMachOType(IsLittleEndian, Is64bits), Object),
@@ -210,14 +234,15 @@ MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian,
DataInCodeLoadCmd(nullptr), LinkOptHintsLoadCmd(nullptr),
DyldInfoLoadCmd(nullptr), UuidLoadCmd(nullptr),
HasPageZeroSegment(false) {
- // Parse header.
if (is64Bit())
- Header64 = getStruct<MachO::mach_header_64>(this, getPtr(this, 0));
+ parseHeader(this, Header64, EC);
else
// First fields of MachO::mach_header_64 are the same as
// in MachO::mach_header.
- *reinterpret_cast<MachO::mach_header *>(&this->Header64) =
- getStruct<MachO::mach_header>(this, getPtr(this, 0));
+ parseHeader(this, *reinterpret_cast<MachO::mach_header *>(&this->Header64),
+ EC);
+ if (EC)
+ return;
uint32_t LoadCommandCount = getHeader().ncmds;
if (LoadCommandCount == 0)
diff --git a/llvm/test/Object/Inputs/macho-invalid-header b/llvm/test/Object/Inputs/macho-invalid-header
new file mode 100644
index 00000000000..da52d43a03a
--- /dev/null
+++ b/llvm/test/Object/Inputs/macho-invalid-header
Binary files differ
diff --git a/llvm/test/Object/macho-invalid.test b/llvm/test/Object/macho-invalid.test
index 8af30b6c844..fd09abf338b 100644
--- a/llvm/test/Object/macho-invalid.test
+++ b/llvm/test/Object/macho-invalid.test
@@ -34,3 +34,6 @@ NAME-PAST-EOF: Symbol name entry points before beginning or past end of file
RUN: not llvm-nm %p/Inputs/macho-invalid-section-index-getSectionRawName 2>&1 \
RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SYMBOL-SEC %s
INVALID-SECTION-IDX-SYMBOL-SEC: getSymbolSection: Invalid section index
+
+RUN: not llvm-objdump -private-headers %p/Inputs/macho-invalid-header 2>&1 | FileCheck -check-prefix INVALID-HEADER %s
+INVALID-HEADER: Invalid data was encountered while parsing the file
OpenPOWER on IntegriCloud