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

Merge

Browse Source
This commit is contained in:
John Reiser
2008-04-02 19:10:39 -07:00
parent 3926ccccad f431307ef2
commit 545ac7fcfa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinz.cpp
+5 -3
View File
@@ -138,11 +138,12 @@ int PackVmlinuzI386::decompressKernel()
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
fi->readx(obuf, file_size); fi->readx(obuf, file_size);
char const *base = 0; {
const upx_byte *base = NULL;
unsigned relocated = 0; unsigned relocated = 0;
// See startup_32: in linux/arch/i386/boot/compressed/head.S // See startup_32: in linux/arch/i386/boot/compressed/head.S
char const *p = (char const *)&obuf[setup_size]; const upx_byte *p = &obuf[setup_size];
for (int j= 0; j < 0x200; ++j, ++p) { for (int j= 0; j < 0x200; ++j, ++p) {
if (0==memcmp("\x8d\x83", p, 2) // leal d32(%ebx),%eax if (0==memcmp("\x8d\x83", p, 2) // leal d32(%ebx),%eax
&& 0==memcmp("\xff\xe0", 6+ p, 2) // jmp *%eax && 0==memcmp("\xff\xe0", 6+ p, 2) // jmp *%eax
@@ -185,7 +186,7 @@ int PackVmlinuzI386::decompressKernel()
} }
} }
if (base && relocated) { if (base && relocated) {
char const *p = relocated + base; p = base + relocated;
for (int j= 0; j < 0x200; ++j, ++p) { for (int j= 0; j < 0x200; ++j, ++p) {
if (0==memcmp("\x01\x9c\x0b", p, 3) // addl %ebx,d32(%ebx,%ecx) if (0==memcmp("\x01\x9c\x0b", p, 3) // addl %ebx,d32(%ebx,%ecx)
) { ) {
@@ -198,6 +199,7 @@ int PackVmlinuzI386::decompressKernel()
} }
} }
} }
}
checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024)); checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024));