Magic-Mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx.git synced 2025-03-03 21:37:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

PeFile: Defend against bad crafted import descriptors

Browse Source 
https://github.com/upx/upx/issues/143
	modified:   pefile.cpp
	modified:   pefile.h
This commit is contained in:
John Reiser 2017-11-08 11:07:46 -08:00
parent 19c2c1edcf
commit 5d9dcb634b
2 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/pefile.cpp
View File

@ -547,12 +547,49 @@ void PeFile64::processRelocs() // pass1
// import handling
**************************************************************************/
__packed_struct(import_desc)
LE32 oft; // orig first thunk
char _[8];
LE32 dllname;
LE32 iat; // import address table
__packed_struct_end()
//__packed_struct(import_desc)
// LE32 oft; // orig first thunk
// char _[8];
// LE32 dllname;
// LE32 iat; // import address table
//__packed_struct_end()
LE32& PeFile::IDSIZE(unsigned x) {
if ((file_size - sizeof(import_desc)) < iddirs[x].size) {
char buf[52];
snprintf(buf,sizeof(buf),"bad import[%d].size %#x",
(unsigned)x, (unsigned)iddirs[x].size);
throwCantPack(buf);
}
return iddirs[x].size;
}
LE32& PeFile::IDADDR(unsigned x) {
if ((file_size - sizeof(import_desc)) < iddirs[x].vaddr) {
char buf[52];
snprintf(buf,sizeof(buf),"bad import[%d].vaddr %#x",
(unsigned)x, (unsigned)iddirs[x].vaddr);
throwCantPack(buf);
}
return iddirs[x].vaddr;
}
LE32& PeFile::ODSIZE(unsigned x) {
if ((file_size - sizeof(import_desc)) < oddirs[x].size) {
char buf[52];
snprintf(buf,sizeof(buf),"bad export[%d].size %#x",
(unsigned)x, (unsigned)oddirs[x].size);
throwCantPack(buf);
}
return oddirs[x].size;
}
LE32& PeFile::ODADDR(unsigned x) {
if ((file_size - sizeof(import_desc)) < oddirs[x].vaddr) {
char buf[52];
snprintf(buf,sizeof(buf),"bad export[%d].vaddr %#x",
(unsigned)x, (unsigned)oddirs[x].vaddr);
throwCantPack(buf);
}
return oddirs[x].vaddr;
}
/*
ImportLinker: 32 and 64 bit import table building.

15
src/pefile.h
View File

@ -178,10 +178,17 @@ protected:
ddirs_t *iddirs;
ddirs_t *oddirs;
LE32 &IDSIZE(unsigned x) { return iddirs[x].size; }
LE32 &IDADDR(unsigned x) { return iddirs[x].vaddr; }
LE32 &ODSIZE(unsigned x) { return oddirs[x].size; }
LE32 &ODADDR(unsigned x) { return oddirs[x].vaddr; }
__packed_struct(import_desc)
LE32 oft; // orig first thunk
char _[8];
LE32 dllname;
LE32 iat; // import address table
__packed_struct_end()
LE32 &IDSIZE(unsigned x);
LE32 &IDADDR(unsigned x);
LE32 &ODSIZE(unsigned x);
LE32 &ODADDR(unsigned x);
__packed_struct(pe_section_t)
char name[8];