diff options
author | Chris Bieneman <chris.bieneman@me.com> | 2018-06-01 22:52:59 +0000 |
---|---|---|
committer | Chris Bieneman <chris.bieneman@me.com> | 2018-06-01 22:52:59 +0000 |
commit | a380a4e5ba2484e9239315d8fd85fbf0f9c3a6fc (patch) | |
tree | 23f13ccf4107cef03720dcbd21759a22cd3e86ee /unittests/BinaryFormat | |
parent | eacd22487e0d6f87178f54a9b1e5d3d5cd116c8c (diff) |
Re-land: [MachO] Fixing ub in MachO BinaryFormat
This re-lands r333797 with a fix for big endian systems.
Original commit message:
This isn't encountered anywhere inside LLVM, so I wrote a test case to expose the issue and verify that it is fixed.
The basic problem is that the macho_load_command union contains all load comamnd structs. Load command structs in 32-bit macho files can be 32-bit aligned instead of 64-bit aligned.
There are some strange circumstances in which this can be exposed in a 64-bit macho if the load commands are invalid or if a 32-bit aligned load command is used. In the past we've worked around this type of problem with changes like r264232.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@333803 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/BinaryFormat')
-rw-r--r-- | unittests/BinaryFormat/CMakeLists.txt | 1 | ||||
-rw-r--r-- | unittests/BinaryFormat/MachOTest.cpp | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/unittests/BinaryFormat/CMakeLists.txt b/unittests/BinaryFormat/CMakeLists.txt index 631936795b6..95c672e35be 100644 --- a/unittests/BinaryFormat/CMakeLists.txt +++ b/unittests/BinaryFormat/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS add_llvm_unittest(BinaryFormatTests DwarfTest.cpp + MachOTest.cpp TestFileMagic.cpp ) diff --git a/unittests/BinaryFormat/MachOTest.cpp b/unittests/BinaryFormat/MachOTest.cpp new file mode 100644 index 00000000000..7d90c612d3d --- /dev/null +++ b/unittests/BinaryFormat/MachOTest.cpp @@ -0,0 +1,47 @@ +//===- unittest/BinaryFormat/MachOTest.cpp - MachO support tests ----------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "llvm/BinaryFormat/MachO.h" +#include "gtest/gtest.h" + +using namespace llvm; +using namespace llvm::MachO; + +TEST(MachOTest, UnalignedLC) { + unsigned char Valid32BitMachO[] = { + 0xCE, 0xFA, 0xED, 0xFE, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, + 0x85, 0x80, 0x21, 0x01, 0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x5F, 0x5F, 0x50, 0x41, 0x47, 0x45, 0x5A, 0x45, 0x52, 0x4F, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x5F, 0x5F, 0x4C, 0x49, + 0x4E, 0x4B, 0x45, 0x44, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, + 0x8C, 0x0B, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + + mach_header *Header = + reinterpret_cast<mach_header *>(Valid32BitMachO); + if (!sys::IsLittleEndianHost) + sys::swapByteOrder(Header->magic); + ASSERT_EQ(Header->magic, MH_MAGIC); + unsigned char *Current = Valid32BitMachO + sizeof(mach_header); + unsigned char *BufferEnd = + Valid32BitMachO + sizeof(mach_header) + Header->sizeofcmds; + while (Current < BufferEnd) { + macho_load_command *LC = + reinterpret_cast<macho_load_command *>(Current); + if (!sys::IsLittleEndianHost) + swapStruct(LC->load_command_data); + ASSERT_EQ(LC->load_command_data.cmd, LC_SEGMENT); + Current += LC->load_command_data.cmdsize; + } +} |