Mirror
/
upx
mirror of https://github.com/upx/upx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

PackLinuxElf::canUnpack must checkEhdr() for ELF input 

https://github.com/upx/upx/issues/485
	modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser 2021-04-10 10:11:48 -07:00 committed by Markus F.X.J. Oberhumer
parent bf957f435e
commit be050693f2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/p_lx_elf.cpp
View File

@ -1971,12 +1971,16 @@ bool PackLinuxElf32::calls_crt1(Elf32_Rel const *rel, int sz)
int PackLinuxElf32::canUnpack()
{
if (super::canUnpack()) {
return true;
if (checkEhdr(&ehdri)) {
return false;
}
// FIXME: ET_DYN same as 64-bit canUnpack ??
if (Elf32_Ehdr::ET_DYN==get_te16(&ehdri.e_type)) {
PackLinuxElf32help1(fi);
}
if (super::canUnpack()) {
return true;
}
return false;
}
@ -2396,8 +2400,8 @@ proceed: ;
int PackLinuxElf64::canUnpack()
{
if (super::canUnpack()) {
return true;
if (checkEhdr(&ehdri)) {
return false;
}
if (Elf64_Ehdr::ET_DYN==get_te16(&ehdri.e_type)) {
PackLinuxElf64help1(fi);
@ -2413,7 +2417,13 @@ int PackLinuxElf64::canUnpack()
fi->seek(filesz+offset, SEEK_SET);
MemBuffer buf(32 + sizeof(overlay_offset));
fi->readx(buf, buf.getSize());
return PackUnix::find_overlay_offset(buf);
unsigned x = PackUnix::find_overlay_offset(buf);
if (x) {
return x;
}
}
if (super::canUnpack()) {
return true;
}
return false;
}