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

PE: Make imports in decompressor stub optional

Browse Source
This commit is contained in:
Kornel Pal 2021-12-22 03:00:17 +01:00 committed by Markus F.X.J. Oberhumer
parent 76ddf6b8da
commit 1d9c211eed
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/p_w32pe.cpp
View File

@ -168,7 +168,7 @@ void PackW32Pe::buildLoader(const Filter *ft)
addLoader("CLEARSTACK", nullptr); addLoader("CLEARSTACK", nullptr);
addLoader("PEMAIN21", nullptr); addLoader("PEMAIN21", nullptr);
//NEW: last loader sections split up to insert TLS callback handler - Stefan Widmann //NEW: last loader sections split up to insert TLS callback handler - Stefan Widmann
addLoader(ih.entry ? "PEDOJUMP" : "PERETURN", nullptr); addLoader(ih.entry || !ilinker ? "PEDOJUMP" : "PERETURN", nullptr);
//NEW: TLS callback support PART 2, the callback handler - Stefan Widmann //NEW: TLS callback support PART 2, the callback handler - Stefan Widmann
if(use_tls_callbacks) if(use_tls_callbacks)
@ -232,16 +232,19 @@ void PackW32Pe::defineSymbols(unsigned ncsection, unsigned upxsection,
} }
linker->defineSymbol("reloc_delt", 0u - (unsigned) ih.imagebase - rvamin); linker->defineSymbol("reloc_delt", 0u - (unsigned) ih.imagebase - rvamin);
linker->defineSymbol("start_of_relocs", crelocs); linker->defineSymbol("start_of_relocs", crelocs);
if (!isdll)
linker->defineSymbol("ExitProcess", 0u-rvamin + if (ilinker) {
ilinkerGetAddress("kernel32.dll", "ExitProcess")); if (!isdll)
linker->defineSymbol("GetProcAddress", 0u-rvamin + linker->defineSymbol("ExitProcess", 0u-rvamin +
ilinkerGetAddress("kernel32.dll", "GetProcAddress")); ilinkerGetAddress("kernel32.dll", "ExitProcess"));
linker->defineSymbol("kernel32_ordinals", myimport); linker->defineSymbol("GetProcAddress", 0u-rvamin +
linker->defineSymbol("LoadLibraryA", 0u-rvamin + ilinkerGetAddress("kernel32.dll", "GetProcAddress"));
ilinkerGetAddress("kernel32.dll", "LoadLibraryA")); linker->defineSymbol("kernel32_ordinals", myimport);
linker->defineSymbol("start_of_imports", myimport); linker->defineSymbol("LoadLibraryA", 0u-rvamin +
linker->defineSymbol("compressed_imports", cimports); ilinkerGetAddress("kernel32.dll", "LoadLibraryA"));
linker->defineSymbol("start_of_imports", myimport);
linker->defineSymbol("compressed_imports", cimports);
}
defineDecompressorSymbols(); defineDecompressorSymbols();
linker->defineSymbol("filter_buffer_start", ih.codebase - rvamin); linker->defineSymbol("filter_buffer_start", ih.codebase - rvamin);

25
src/p_w64pep.cpp
View File

@ -167,7 +167,7 @@ void PackW64Pep::buildLoader(const Filter *ft)
if (ih.entry && isdll) if (ih.entry && isdll)
addLoader("PEISDLL9"); addLoader("PEISDLL9");
addLoader(ih.entry ? "PEDOJUMP" : "PERETURN", nullptr); addLoader(ih.entry || !ilinker ? "PEDOJUMP" : "PERETURN", nullptr);
//NEW: TLS callback support PART 2, the callback handler - Stefan Widmann //NEW: TLS callback support PART 2, the callback handler - Stefan Widmann
if(use_tls_callbacks) if(use_tls_callbacks)
@ -227,16 +227,19 @@ void PackW64Pep::defineSymbols(unsigned ncsection, unsigned upxsection,
ilinkerGetAddress("kernel32.dll", "VirtualProtect")); ilinkerGetAddress("kernel32.dll", "VirtualProtect"));
} }
linker->defineSymbol("start_of_relocs", crelocs); linker->defineSymbol("start_of_relocs", crelocs);
if (!isdll)
linker->defineSymbol("ExitProcess", if (ilinker) {
ilinkerGetAddress("kernel32.dll", "ExitProcess")); if (!isdll)
linker->defineSymbol("GetProcAddress", linker->defineSymbol("ExitProcess",
ilinkerGetAddress("kernel32.dll", "GetProcAddress")); ilinkerGetAddress("kernel32.dll", "ExitProcess"));
linker->defineSymbol("kernel32_ordinals", myimport); linker->defineSymbol("GetProcAddress",
linker->defineSymbol("LoadLibraryA", ilinkerGetAddress("kernel32.dll", "GetProcAddress"));
ilinkerGetAddress("kernel32.dll", "LoadLibraryA")); linker->defineSymbol("kernel32_ordinals", myimport);
linker->defineSymbol("start_of_imports", myimport); linker->defineSymbol("LoadLibraryA",
linker->defineSymbol("compressed_imports", cimports); ilinkerGetAddress("kernel32.dll", "LoadLibraryA"));
linker->defineSymbol("start_of_imports", myimport);
linker->defineSymbol("compressed_imports", cimports);
}
if (M_IS_LZMA(ph.method)) if (M_IS_LZMA(ph.method))
{ {

5
src/pefile.cpp
View File

@ -867,6 +867,9 @@ void PeFile::processImports2(unsigned myimport, unsigned) // pass 2
{ {
COMPILE_TIME_ASSERT(sizeof(import_desc) == 20); COMPILE_TIME_ASSERT(sizeof(import_desc) == 20);
if (!ilinker)
return;
ilinker->relocate_import(myimport); ilinker->relocate_import(myimport);
int len; int len;
oimpdlls = ilinker->getLoader(&len); oimpdlls = ilinker->getLoader(&len);
@ -2540,7 +2543,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
callProcessRelocs(rel, ic); callProcessRelocs(rel, ic);
processImports2(ic, getProcessImportParam(upxsection)); processImports2(ic, getProcessImportParam(upxsection));
ODADDR(PEDIR_IMPORT) = ic; ODADDR(PEDIR_IMPORT) = soimpdlls ? ic : 0;
ODSIZE(PEDIR_IMPORT) = soimpdlls; ODSIZE(PEDIR_IMPORT) = soimpdlls;
ic += soimpdlls; ic += soimpdlls;