jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Mac OS X codesign disallows overhang of vmsize.

Browse Source
This commit is contained in:
John Reiser
2013-01-25 15:58:25 -08:00
parent 5977c296bd
commit 89830a5ae0
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_mach.cpp
+12 -4
View File
@@ -496,7 +496,9 @@ void PackMachPPC32::pack4(OutputFile *fo, Filter &ft) // append PackHeader
secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem); secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem);
} }
secXHDR.addr += secXHDR.offset; secXHDR.addr += secXHDR.offset;
unsigned const foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize)); unsigned foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize));
if (foff1 < segTEXT.vmsize)
foff1 += PAGE_SIZE; // codesign disallows overhang
segLINK.fileoff = foff1; segLINK.fileoff = foff1;
segLINK.vmaddr = segTEXT.vmaddr + foff1; segLINK.vmaddr = segTEXT.vmaddr + foff1;
fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1); fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1);
@@ -538,7 +540,9 @@ void PackMachI386::pack4(OutputFile *fo, Filter &ft) // append PackHeader
secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem); secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem);
} }
secXHDR.addr += secXHDR.offset; secXHDR.addr += secXHDR.offset;
unsigned const foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize)); unsigned foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize));
if (foff1 < segTEXT.vmsize)
foff1 += PAGE_SIZE; // codesign disallows overhang
segLINK.fileoff = foff1; segLINK.fileoff = foff1;
segLINK.vmaddr = segTEXT.vmaddr + foff1; segLINK.vmaddr = segTEXT.vmaddr + foff1;
fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1); fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1);
@@ -580,7 +584,9 @@ void PackMachAMD64::pack4(OutputFile *fo, Filter &ft) // append PackHeader
secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem); secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem);
} }
secXHDR.addr += secXHDR.offset; secXHDR.addr += secXHDR.offset;
unsigned const foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize)); unsigned foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize));
if (foff1 < segTEXT.vmsize)
foff1 += PAGE_SIZE; // codesign disallows overhang
segLINK.fileoff = foff1; segLINK.fileoff = foff1;
segLINK.vmaddr = segTEXT.vmaddr + foff1; segLINK.vmaddr = segTEXT.vmaddr + foff1;
fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1); fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1);
@@ -622,7 +628,9 @@ void PackMachARMEL::pack4(OutputFile *fo, Filter &ft) // append PackHeader
secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem); secXHDR.offset -= sizeof(uuid_cmd) + sizeof(linkitem);
} }
secXHDR.addr += secXHDR.offset; secXHDR.addr += secXHDR.offset;
unsigned const foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize)); unsigned foff1 = (PAGE_MASK & (~PAGE_MASK + segTEXT.filesize));
if (foff1 < segTEXT.vmsize)
foff1 += PAGE_SIZE; // codesign disallows overhang
segLINK.fileoff = foff1; segLINK.fileoff = foff1;
segLINK.vmaddr = segTEXT.vmaddr + foff1; segLINK.vmaddr = segTEXT.vmaddr + foff1;
fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1); fo->seek(foff1 - 1, SEEK_SET); fo->write("", 1);
src/p_unix.cpp
+4 -2
View File
@@ -505,8 +505,10 @@ int PackUnix::canUnpack()
{ {
int const small = 32 + sizeof(overlay_offset); int const small = 32 + sizeof(overlay_offset);
// Allow zero-filled last page, for Mac OS X code signing. // Allow zero-filled last page, for Mac OS X code signing.
upx_byte buf[4096 + 2*small +1]; int bufsize = 2*4096 + 2*small +1;
const int bufsize = sizeof(buf); if (bufsize > fi->st_size())
bufsize = fi->st_size();
upx_byte buf[bufsize];
fi->seek(-bufsize, SEEK_END); fi->seek(-bufsize, SEEK_END);
fi->readx(buf, bufsize); fi->readx(buf, bufsize);