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

Improved some ELF header checks.

Browse Source 
committer: mfx <mfx> 978099239 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-12-29 14:13:59 +00:00
parent 65ad79d727
commit 11ee8627b8
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+4 -1
View File
@@ -183,8 +183,11 @@ bool PackLinuxI386elf::canPack()
if (j >= 14) if (j >= 14)
return false; return false;
if (phdr->PT_LOAD == phdr->p_type) { if (phdr->PT_LOAD == phdr->p_type) {
if (phdr->p_offset!=0) if (phdr->p_offset != 0)
{
throwCantPack("invalid Phdr p_offset; try `--force-execve'");
return false; return false;
}
exetype = 1; exetype = 1;
break; break;
} }
src/p_lx_exc.cpp
+7 -2
View File
@@ -95,11 +95,10 @@ int PackLinuxI386::checkEhdr(const Elf_LE32_Ehdr *ehdr) const
{ {
const unsigned char * const buf = ehdr->e_ident; const unsigned char * const buf = ehdr->e_ident;
// NOTE: ELF executables are now handled by p_lx_elf.cpp. // info: ELF executables are now handled by p_lx_elf.cpp
if (memcmp(buf, "\x7f\x45\x4c\x46\x01\x01\x01", 7)) // ELF 32-bit LSB if (memcmp(buf, "\x7f\x45\x4c\x46\x01\x01\x01", 7)) // ELF 32-bit LSB
return -1; return -1;
// FIXME: add special checks for uncompresed "vmlinux" kernel
// now check the ELF header // now check the ELF header
if (!memcmp(buf+8, "FreeBSD", 7)) // branded if (!memcmp(buf+8, "FreeBSD", 7)) // branded
return 1; return 1;
@@ -109,6 +108,12 @@ int PackLinuxI386::checkEhdr(const Elf_LE32_Ehdr *ehdr) const
return 3; return 3;
if (ehdr->e_version != 1) // version if (ehdr->e_version != 1) // version
return 4; return 4;
if (ehdr->e_phnum < 1)
return 5;
// FIXME: add special checks for uncompresed "vmlinux" kernel
// FIXME: add special checks for other ELF i386 formats, like
// NetBSD, OpenBSD, Solaris, ....
// success // success
return 0; return 0;