mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Allow __PAGEZERO.vmsize to be 0x1000 on x86_64, as for "go"-language.

Browse Source 
https://github.com/upx/upx/issues/59
	modified:   p_mach.cpp
	modified:   p_mach.h
This commit is contained in:
John Reiser 2017-02-05 14:50:08 -08:00
parent 02e7981e10
commit 93cefde8fc
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/p_mach.cpp
View File

@ -105,7 +105,7 @@ PackMachBase<T>::PackMachBase(InputFile *f, unsigned cputype, unsigned filetype,
super(f), my_cputype(cputype), my_filetype(filetype), my_thread_flavor(flavor), super(f), my_cputype(cputype), my_filetype(filetype), my_thread_flavor(flavor),
my_thread_state_word_count(count), my_thread_command_size(size), my_thread_state_word_count(count), my_thread_command_size(size),
n_segment(0), rawmseg(NULL), msegcmd(NULL), o_routines_cmd(0), n_segment(0), rawmseg(NULL), msegcmd(NULL), o_routines_cmd(0),
prev_init_address(0) prev_init_address(0), pagezero_vmsize(0)
{ {
MachClass::compileTimeAssertions(); MachClass::compileTimeAssertions();
bele = N_BELE_CTP::getRTP((const BeLePolicy*) NULL); bele = N_BELE_CTP::getRTP((const BeLePolicy*) NULL);
@ -647,6 +647,11 @@ void PackMachBase<T>::pack4(OutputFile *fo, Filter &ft) // append PackHeader
case Mach_segment_command::LC_SEGMENT: // fall through case Mach_segment_command::LC_SEGMENT: // fall through
case Mach_segment_command::LC_SEGMENT_64: { case Mach_segment_command::LC_SEGMENT_64: {
Mach_segment_command *const segptr = (Mach_segment_command *)lcp; Mach_segment_command *const segptr = (Mach_segment_command *)lcp;
if (!strcmp("__PAGEZERO", segptr->segname)) {
if (pagezero_vmsize < 0xF0000000ull) {
segptr->vmsize = pagezero_vmsize;
}
}
if (!strcmp("__TEXT", segptr->segname)) { if (!strcmp("__TEXT", segptr->segname)) {
segtxt = segptr; // remember base for appending segtxt = segptr; // remember base for appending
sectxt = (Mach_section_command *)(1+ segptr); sectxt = (Mach_section_command *)(1+ segptr);
@ -1380,7 +1385,12 @@ void PackMachBase<T>::pack1(OutputFile *const fo, Filter &/*ft*/) // generate e
if __acc_cte(sizeof(segZERO.vmsize) == 8 if __acc_cte(sizeof(segZERO.vmsize) == 8
&& mhdro.filetype == Mach_header::MH_EXECUTE && mhdro.filetype == Mach_header::MH_EXECUTE
&& mhdro.cputype == Mach_header::CPU_TYPE_X86_64) { && mhdro.cputype == Mach_header::CPU_TYPE_X86_64) {
segZERO.vmsize <<= 20; // (1ul<<32) if (pagezero_vmsize < 0xF0000000ull) {
segZERO.vmsize = pagezero_vmsize;
}
else {
segZERO.vmsize <<= 20; // (1ul<<32)
}
} }
segTEXT.cmd = lc_seg; segTEXT.cmd = lc_seg;
@ -1868,6 +1878,11 @@ bool PackMachBase<T>::canPack()
// Put LC_SEGMENT together at the beginning, ascending by .vmaddr. // Put LC_SEGMENT together at the beginning, ascending by .vmaddr.
qsort(msegcmd, ncmds, sizeof(*msegcmd), compare_segment_command); qsort(msegcmd, ncmds, sizeof(*msegcmd), compare_segment_command);
if (lc_seg==msegcmd[0].cmd && 0==msegcmd[0].vmaddr
&& !strcmp("__PAGEZERO", msegcmd[0].segname)) {
pagezero_vmsize = msegcmd[0].vmsize;
}
// Check alignment of non-null LC_SEGMENT. // Check alignment of non-null LC_SEGMENT.
for (unsigned j= 0; j < ncmds; ++j) { for (unsigned j= 0; j < ncmds; ++j) {
if (lc_seg==msegcmd[j].cmd) { if (lc_seg==msegcmd[j].cmd) {

1
src/p_mach.h
View File

@ -855,6 +855,7 @@ protected:
Mach_segment_command *msegcmd; // LC_SEGMENT first, without sections Mach_segment_command *msegcmd; // LC_SEGMENT first, without sections
unsigned o_routines_cmd; // file offset to LC_ROUINTES unsigned o_routines_cmd; // file offset to LC_ROUINTES
upx_uint64_t prev_init_address; upx_uint64_t prev_init_address;
upx_uint64_t pagezero_vmsize;
Mach_header mhdri; Mach_header mhdri;
Mach_header mhdro; Mach_header mhdro;