Mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx.git synced 2025-08-11 22:52:30 +08:00
Code Issues Projects Releases Wiki Activity

PE: disable CFG and compress with --force

Browse Source
This commit is contained in:
bitraid
2021-05-01 18:05:27 +03:00
committed by Markus F.X.J. Oberhumer
parent 144010295e
commit d55746f62d
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pefile.cpp
View File

@ -2292,9 +2292,6 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
if (!opt->force && handleForceOption())
throwCantPack("unexpected value in PE header (try --force)");
if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD)
throwCantPack("CFGuard enabled PE files are not supported");
if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY)
{
if (opt->force)
@ -2317,6 +2314,26 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
overlay = 0;
checkOverlay(overlay);
if (ih.dllflags & IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD)
{
if (opt->force)
{
const unsigned lcsize = IDSIZE(PEDIR_LOADCONF);
const unsigned lcaddr = IDADDR(PEDIR_LOADCONF);
const unsigned gfpos = 14 * sizeof(ih.imagebase) +
6 * sizeof(LE32) + 4 * sizeof(LE16);
if (lcaddr && lcsize >= gfpos + sizeof(LE32))
// GuardFlags: Set IMAGE_GUARD_SECURITY_COOKIE_UNUSED
// and clear the rest
set_le32(ibuf.subref("bad guard flags at %#x", lcaddr + gfpos,
sizeof(LE32)), 0x00000800);
ih.dllflags ^= IMAGE_DLLCHARACTERISTICS_CONTROL_FLOW_GUARD;
}
else
throwCantPack("CFGuard enabled PE files are not supported (use "
"--force to disable)");
}
Resource res(ibuf, ibuf + ibuf.getSize());
Interval tlsiv(ibuf);
Interval loadconfiv(ibuf);