This is an archive of the discontinued LLVM Phabricator instance.

Differential D113819

[llvm-obcopy][MachO] Add error for MH_PRELOAD
ClosedPublic

Authored by keith on Nov 12 2021, 5:25 PM.

Details

Reviewers
alexander-shaposhnikov
rupprecht
jhenderson
Commits
rG47bb456b2ffd: [llvm-obcopy][MachO] Add error for MH_PRELOAD
Summary

Previously this would crash. Fixes https://bugs.llvm.org/show_bug.cgi?id=51877

Diff Detail

Event Timeline

keith created this revision.Nov 12 2021, 5:25 PM
Herald added a reviewer: rupprecht. · View Herald TranscriptNov 12 2021, 5:25 PM
Herald added a reviewer: jhenderson. · View Herald Transcript
keith requested review of this revision.Nov 12 2021, 5:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 12 2021, 5:25 PM
Herald added subscribers: llvm-commits, MaskRay. · View Herald Transcript
alexander-shaposhnikov added inline comments.Nov 12 2021, 5:48 PM
llvm/test/tools/llvm-objcopy/MachO/Inputs/mh_preload.yaml
1

this can be reduced to just the header, no load commands, no sections

llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
396

if I am not mistaken this should be replaced with llvm::errc::not_supported

keith updated this revision to Diff 386991.Nov 12 2021, 5:59 PM
keith marked 2 inline comments as done.

Improve test, change error code

alexander-shaposhnikov accepted this revision.Nov 12 2021, 6:01 PM

LG, thanks for the fix!

This revision is now accepted and ready to land.Nov 12 2021, 6:01 PM
keith added a comment.Nov 12 2021, 6:01 PM

Thanks for the super quick review!

Harbormaster completed remote builds in B134066: Diff 386991.Nov 12 2021, 6:54 PM
Closed by commit rG47bb456b2ffd: [llvm-obcopy][MachO] Add error for MH_PRELOAD (authored by keith). · Explain WhyNov 12 2021, 7:20 PM
This revision was automatically updated to reflect the committed changes.
keith added a commit: rG47bb456b2ffd: [llvm-obcopy][MachO] Add error for MH_PRELOAD.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-objcopy/
MachO/
Inputs/
99 lines
4 lines
tools/
llvm-objcopy/
MachO/
5 lines

Diff 386987

llvm/test/tools/llvm-objcopy/MachO/Inputs/mh_preload.yaml

  • This file was added.
--- !mach-o
alexander-shaposhnikovUnsubmitted
Done
ReplyInline Actions

this can be reduced to just the header, no load commands, no sections

alexander-shaposhnikov: this can be reduced to just the header, no load commands, no sections
FileHeader:
magic: 0xFEEDFACF
cputype: 0x100000C
cpusubtype: 0x0
filetype: 0x5
ncmds: 4
sizeofcmds: 568
flags: 0x1
reserved: 0x0
LoadCommands:
- cmd: LC_SEGMENT_64
cmdsize: 232
segname: __TEXT
vmaddr: 15728640
vmsize: 16384
fileoff: 32768
filesize: 16384
maxprot: 5
initprot: 5
nsects: 2
flags: 0
Sections:
- sectname: __text
segname: __TEXT
addr: 0xF00000
size: 4
offset: 0x8000
align: 2
reloff: 0x0
nreloc: 0
flags: 0x80000400
reserved1: 0x0
reserved2: 0x0
reserved3: 0x0
content: C0035FD6
- sectname: __foo
segname: __TEXT
addr: 0xF00004
size: 8
offset: 0x8004
align: 0
reloff: 0x0
nreloc: 0
flags: 0x0
reserved1: 0x0
reserved2: 0x0
reserved3: 0x0
content: FFFF0000FFFF0000
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 49152
nsyms: 1
stroff: 49168
strsize: 8
- cmd: LC_UUID
cmdsize: 24
uuid: 57ABEDF8-484D-35A6-85BD-32CA7C92BBE3
- cmd: LC_UNIXTHREAD
cmdsize: 288
PayloadBytes: [ 0x6, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xF0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
LinkEditData:
NameList:
- n_strx: 2
n_type: 0xF
n_sect: 1
n_desc: 0
n_value: 15728640
StringTable:
- ' '
- start
...

llvm/test/tools/llvm-objcopy/MachO/mh-preload-unsupported.test

  • This file was added.
RUN: yaml2obj %p/Inputs/mh_preload.yaml > %t
RUN: not llvm-objcopy %t 2>&1 | FileCheck %s -DFILE=%t
CHECK: error: [[FILE]]: MH_PRELOAD files are not supported

llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp

Show First 20 Lines • Show All 386 Lines • ▼ Show 20 LinesError objcopy::macho::executeObjcopyOnBinary(const CommonConfig &Config,
const MachOConfig &MachOConfig, const MachOConfig &MachOConfig,
object::MachOObjectFile &In, object::MachOObjectFile &In,
raw_ostream &Out) { raw_ostream &Out) {
MachOReader Reader(In); MachOReader Reader(In);
Expected<std::unique_ptr<Object>> O = Reader.create(); Expected<std::unique_ptr<Object>> O = Reader.create();
if (!O) if (!O)
return createFileError(Config.InputFilename, O.takeError()); return createFileError(Config.InputFilename, O.takeError());
if (O->get()->Header.FileType == MachO::HeaderFileType::MH_PRELOAD)
return createStringError(std::errc::invalid_argument,
alexander-shaposhnikovUnsubmitted
Done
ReplyInline Actions

if I am not mistaken this should be replaced with llvm::errc::not_supported

alexander-shaposhnikov: if I am not mistaken this should be replaced with llvm::errc::not_supported
"%s: MH_PRELOAD files are not supported",
Config.InputFilename.str().c_str());
if (Error E = handleArgs(Config, MachOConfig, **O)) if (Error E = handleArgs(Config, MachOConfig, **O))
return createFileError(Config.InputFilename, std::move(E)); return createFileError(Config.InputFilename, std::move(E));
// Page size used for alignment of segment sizes in Mach-O executables and // Page size used for alignment of segment sizes in Mach-O executables and
// dynamic libraries. // dynamic libraries.
uint64_t PageSize; uint64_t PageSize;
switch (In.getArch()) { switch (In.getArch()) {
case Triple::ArchType::arm: case Triple::ArchType::arm:
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines