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

Cleaned up some canPack() checks.

Browse Source 
committer: mfx <mfx> 977393067 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-12-21 10:04:27 +00:00
parent 1dcaedab30
commit 42fe803a39
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinz.cpp
+12 -6
View File
@@ -95,16 +95,22 @@ int PackVmlinuzI386::readFileHeader()
setup_size = (1 + (h.setup_sects ? h.setup_sects : 4)) * 0x200; setup_size = (1 + (h.setup_sects ? h.setup_sects : 4)) * 0x200;
if (setup_size <= 0 || setup_size >= file_size) if (setup_size <= 0 || setup_size >= file_size)
return -1; return -1;
if (setup_size + 16 * h.sys_size // beware 16-bit sys_size
!= (~(~0u<<20) & (unsigned) ALIGN_UP(file_size, 16)) ) int format = UPX_F_VMLINUZ_i386;
unsigned sys_size = ALIGN_UP(file_size, 16) - setup_size;
if (memcmp(h.hdrs, "HdrS", 4) == 0 && (h.load_flags & 1) != 0)
{
format = UPX_F_BVMLINUZ_i386;
// account for 16-bit h.sys_size, wraparound at 20 bits
sys_size &= (1 << 20) - 1;
}
if (16 * h.sys_size != sys_size)
return -1; return -1;
// FIXME: add more checks for a valid kernel // FIXME: add more checks for a valid kernel
if (memcmp(h.hdrs, "HdrS", 4) == 0 && (h.load_flags & 1) != 0) return format;
return UPX_F_BVMLINUZ_i386;
return UPX_F_VMLINUZ_i386;
} }