RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Re-land: [MachO] Fixing ub in MachO BinaryFormat

Browse Source 
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.

llvm-svn: 333803
This commit is contained in:
Chris Bieneman 2018-06-01 22:52:59 +00:00
parent 40f3e86592
commit ad60f90629
3 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/BinaryFormat/MachO.h
View File

@ -1973,9 +1973,11 @@ const uint32_t PPC_THREAD_STATE_COUNT =
// Define a union of all load command structs // Define a union of all load command structs
#define LOAD_COMMAND_STRUCT(LCStruct) LCStruct LCStruct##_data; #define LOAD_COMMAND_STRUCT(LCStruct) LCStruct LCStruct##_data;
union macho_load_command { LLVM_PACKED_START
union LLVM_ALIGNAS(4) macho_load_command {
#include "llvm/BinaryFormat/MachO.def" #include "llvm/BinaryFormat/MachO.def"
}; };
LLVM_PACKED_END
} // end namespace MachO } // end namespace MachO
} // end namespace llvm } // end namespace llvm

1
unittests/BinaryFormat/CMakeLists.txt
View File

@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(BinaryFormatTests add_llvm_unittest(BinaryFormatTests
DwarfTest.cpp DwarfTest.cpp
MachOTest.cpp
TestFileMagic.cpp TestFileMagic.cpp
) )

47
unittests/BinaryFormat/MachOTest.cpp Normal file
View File

@ -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;
}
}