mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

more checking when treating ELF as .bin

Browse Source
This commit is contained in:
John Reiser 2008-07-20 05:40:00 -07:00
parent b05ba7683e
commit bf046a8ccb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/p_vmlinz.cpp
View File

@ -292,7 +292,7 @@ int PackVmlinuzI386::decompressKernel()
continue;
if (0x208<=h.version && 0==memcmp("\177ELF", ibuf, 4)) {
// Full ELF in theory; but for now, try to handle as .bin.
// Full ELF in theory; but for now, try to handle as .bin at 0x100000.
// Check for PT_LOAD.p_paddr being ascending and adjacent.
Elf_LE32_Ehdr const *const ehdr = (Elf_LE32_Ehdr const *)(void const *)ibuf;
Elf_LE32_Phdr const *phdr = (Elf_LE32_Phdr const *)(ehdr->e_phoff + (char const *)ehdr);
@ -302,7 +302,10 @@ int PackVmlinuzI386::decompressKernel()
for (unsigned j=0; j < ehdr->e_phnum; ++j, ++phdr) {
if (phdr->PT_LOAD==phdr->p_type) {
unsigned step = (-1+ phdr->p_align + hi_paddr) & ~(-1+ phdr->p_align);
if (0==hi_paddr) {
if (0==hi_paddr) { // first PT_LOAD
if (0x100000!=phdr->p_paddr) {
return 0; // Not at traditional location.
}
delta_off = phdr->p_paddr - phdr->p_offset;
lo_paddr = phdr->p_paddr;
hi_paddr = phdr->p_filesz + phdr->p_paddr;
@ -317,12 +320,15 @@ int PackVmlinuzI386::decompressKernel()
}
}
unsigned xlen = 0;
// FIXME: ascending order is only a convention; might need sorting.
for (unsigned j=1; j < ehdr->e_shnum; ++j) {
if (shdr->SHF_EXECINSTR & shdr[j].sh_flags) {
xlen += shdr[j].sh_size; // FIXME: include sh_addralign
}
else {
break;
if (shdr->SHT_PROGBITS==shdr->sh_type) { // SHT_REL might be intermixed
if (shdr->SHF_EXECINSTR & shdr[j].sh_flags) {
xlen += shdr[j].sh_size; // FIXME: include sh_addralign
}
else {
break;
}
}
}
//printf("xlen = 0x%x\n", xlen); // FIXME: use as length to filter