mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-10-05 19:20:23 +08:00
Code Issues Releases Wiki Activity

Mach-O dyld: __LINKEDIT must have highest .vmaddr and .fileoff

Browse Source
This commit is contained in:
jreiser@BitWagon.com 2016-09-10 15:46:36 -07:00 committed by Markus F.X.J. Oberhumer
parent 89df7451ef
commit 5bb6f246ed
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/p_mach.cpp
View File

@ -825,21 +825,21 @@ void PackMachAMD64::pack4(OutputFile *fo, Filter &ft) // append PackHeader
memcpy(&segLINK, segptr, sizeof(segLINK)); memcpy(&segLINK, segptr, sizeof(segLINK));
delta = offLINK - segLINK.fileoff; // relocation constant delta = offLINK - segLINK.fileoff; // relocation constant
// Mach_command __LINKEDIT // The contents for __LINKEDIT remain the same,
// The contents remain the same, but at a different offset in the file // but move to a different offset in the file
fo->seek(offLINK, SEEK_SET); fo->seek(offLINK, SEEK_SET);
fo->write(&stub_amd64_darwin_macho_upxmain_exe[segLINK.fileoff], segLINK.filesize); fo->write(&stub_amd64_darwin_macho_upxmain_exe[segLINK.fileoff], segLINK.filesize);
// Update the __LINKEDIT header
segLINK.vmaddr += delta;
segLINK.fileoff = offLINK;
fo->seek((char const *)ptr1 - (char const *)ptr0, SEEK_SET);
fo->rewrite(&segLINK, sizeof(segLINK));
// Mach_segment_command for new segXHDR // Mach_segment_command for new segXHDR
segXHDR.cmdsize = sizeof(segXHDR); segXHDR.cmdsize = sizeof(segXHDR);
segXHDR.nsects = 0; segXHDR.nsects = 0;
fo->seek((char const *)ptr1 - (char const *)ptr0, SEEK_SET);
fo->rewrite(&segXHDR, sizeof(segXHDR)); fo->rewrite(&segXHDR, sizeof(segXHDR));
// Update the __LINKEDIT header
segLINK.vmaddr += delta;
segLINK.fileoff = offLINK;
fo->rewrite(&segLINK, sizeof(segLINK));
} }
} break; } break;
case Mach_segment_command::LC_DYLD_INFO_ONLY: { case Mach_segment_command::LC_DYLD_INFO_ONLY: {
@ -1640,25 +1640,32 @@ void PackMachBase<T>::pack1(OutputFile *const fo, Filter &/*ft*/) // generate e
unsigned cmdsize = mhdro.sizeofcmds - sizeof(segXHDR); unsigned cmdsize = mhdro.sizeofcmds - sizeof(segXHDR);
Mach_header const *const ptr0 = (Mach_header const *)stub_amd64_darwin_macho_upxmain_exe; Mach_header const *const ptr0 = (Mach_header const *)stub_amd64_darwin_macho_upxmain_exe;
Mach_command const *ptr1 = (Mach_command const *)(1+ ptr0); Mach_command const *ptr1 = (Mach_command const *)(1+ ptr0);
uint64_t next_va = 0;
uint64_t next_fpos = 0;
for (unsigned j = 0; j < mhdro.ncmds -1; ++j, for (unsigned j = 0; j < mhdro.ncmds -1; ++j,
(cmdsize -= ptr1->cmdsize), (cmdsize -= ptr1->cmdsize),
ptr1 = (Mach_command const *)(ptr1->cmdsize + (char const *)ptr1)) { ptr1 = (Mach_command const *)(ptr1->cmdsize + (char const *)ptr1)) {
Mach_segment_command const *const segptr = (Mach_segment_command const *)ptr1; Mach_segment_command const *const segptr = (Mach_segment_command const *)ptr1;
if (lc_seg == ptr1->cmd && !strcmp("__LINKEDIT", segptr->segname)) { if (lc_seg == ptr1->cmd) {
// Mach_command before __LINKEDIT if (!strcmp("__LINKEDIT", segptr->segname)) {
fo->write((1+ ptr0), (char const *)ptr1 - (char const *)(1+ ptr0)); // Mach_command before __LINKEDIT
// Mach_command __LINKEDIT fo->write((1+ ptr0), (char const *)ptr1 - (char const *)(1+ ptr0));
fo->write(segptr, segptr->cmdsize); // LC_SEGMENT_64 for UPX_DATA; steal space from -Wl,-headerpadsize
// LC_SEGMENT_64 for payload; steal space from -Wl,-headerpadsize segXHDR.cmdsize = sizeof(segXHDR);
segXHDR.cmdsize = sizeof(segXHDR); segXHDR.vmaddr = next_va;
segXHDR.nsects = 0; segXHDR.fileoff = PAGE_MASK & (~PAGE_MASK + next_fpos);
fo->write(&segXHDR, sizeof(segXHDR)); segXHDR.maxprot = segXHDR.initprot = Mach_segment_command::VM_PROT_READ;
// Mach_command after __LINKEDIT segXHDR.nsects = 0;
fo->write(ptr1->cmdsize + (char const *)ptr1, cmdsize - ptr1->cmdsize); fo->write(&segXHDR, sizeof(segXHDR));
// Contents before __LINKEDIT; put non-headers at same offset in file // Mach_command __LINKEDIT and after
unsigned pos = sizeof(mhdro) + mhdro.sizeofcmds; // includes sizeof(segXHDR) fo->write((char const *)ptr1, cmdsize);
fo->write(&stub_amd64_darwin_macho_upxmain_exe[pos], segptr->fileoff - pos); // Contents before __LINKEDIT; put non-headers at same offset in file
break; unsigned pos = sizeof(mhdro) + mhdro.sizeofcmds; // includes sizeof(segXHDR)
fo->write(&stub_amd64_darwin_macho_upxmain_exe[pos], segptr->fileoff - pos);
break;
}
next_va = segptr->vmsize + segptr->vmaddr;
next_fpos = segptr->filesize + segptr->fileoff;
} }
} }
} }