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

Merge pull request #399 from bitraid/no-cfg-pe

Browse Source 
Don't pack Cotrol Flow Guard PE files
This commit is contained in:
John Reiser
2020-08-09 07:12:39 -07:00
committed by GitHub
parent ebe4d2b78f c7c7eb6a14
commit fc1c1924ab
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pefile.cpp
+6 -2
View File
@@ -2107,7 +2107,8 @@ void PeFile::readSectionHeaders(unsigned objs, unsigned sizeof_ih)
} }
void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask, void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask,
unsigned ih_entry, unsigned ih_filealign) unsigned ih_entry, unsigned ih_filealign,
unsigned ih_dllflags)
{ {
if ((1u << subsystem) & ~mask) if ((1u << subsystem) & ~mask)
{ {
@@ -2131,6 +2132,9 @@ void PeFile::checkHeaderValues(unsigned subsystem, unsigned mask,
if (ih_filealign < 0x200) if (ih_filealign < 0x200)
throwCantPack("filealign < 0x200 is not yet supported"); throwCantPack("filealign < 0x200 is not yet supported");
if (ih_dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD)
throwCantPack("CFGuard enabled PE files are not supported");
} }
unsigned PeFile::handleStripRelocs(upx_uint64_t ih_imagebase, unsigned PeFile::handleStripRelocs(upx_uint64_t ih_imagebase,
@@ -2240,7 +2244,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
readSectionHeaders(objs, sizeof(ih)); readSectionHeaders(objs, sizeof(ih));
if (!opt->force && handleForceOption()) if (!opt->force && handleForceOption())
throwCantPack("unexpected value in PE header (try --force)"); throwCantPack("unexpected value in PE header (try --force)");
checkHeaderValues(ih.subsystem, subsystem_mask, ih.entry, ih.filealign); checkHeaderValues(ih.subsystem, subsystem_mask, ih.entry, ih.filealign, ih.dllflags);
//remove certificate directory entry //remove certificate directory entry
if (IDSIZE(PEDIR_SEC)) if (IDSIZE(PEDIR_SEC))
src/pefile.h
+3 -1
View File
@@ -54,7 +54,8 @@ protected:
unsigned readSections(unsigned objs, unsigned usize, unsigned readSections(unsigned objs, unsigned usize,
unsigned ih_filealign, unsigned ih_datasize); unsigned ih_filealign, unsigned ih_datasize);
void checkHeaderValues(unsigned subsystem, unsigned mask, void checkHeaderValues(unsigned subsystem, unsigned mask,
unsigned ih_entry, unsigned ih_filealign); unsigned ih_entry, unsigned ih_filealign,
unsigned ih_dllflags);
unsigned handleStripRelocs(upx_uint64_t ih_imagebase, unsigned handleStripRelocs(upx_uint64_t ih_imagebase,
upx_uint64_t default_imagebase, upx_uint64_t default_imagebase,
unsigned dllflags); unsigned dllflags);
@@ -268,6 +269,7 @@ protected:
IMAGE_DLLCHARACTERISTICS_NO_SEH = 0x0400, IMAGE_DLLCHARACTERISTICS_NO_SEH = 0x0400,
IMAGE_DLLCHARACTERISTICS_NO_BIND = 0x0800, IMAGE_DLLCHARACTERISTICS_NO_BIND = 0x0800,
IMAGE_DLLCHARACTERISTICS_WDM_DRIVER = 0x2000, IMAGE_DLLCHARACTERISTICS_WDM_DRIVER = 0x2000,
IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD = 0x4000,
IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE = 0x8000 IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE = 0x8000
}; };