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

ARM shlib escape hatch moves to just beyond .text.

Browse Source 
https://sourceforge.net/p/upx/bugs/223/
This commit is contained in:
John Reiser
2013-11-22 19:26:19 -08:00
parent 1c459a7bea
commit cd3132667a
4 changed files with 703 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+11 -3
View File
@@ -3042,14 +3042,18 @@ void PackLinuxElf64::unpack(OutputFile *fo)
}
}
}
bool const is_shlib = 0; // XXX ??
bool const is_shlib = 0; // XXX: THIS IS BROKEN; see 32-bit ::unpack
if (is_shlib
|| ((unsigned)(get_te64(&ehdri.e_entry) - load_va) + up4(lsize) +
ph.getPackHeaderSize() + sizeof(overlay_offset))
< up4(fi->st_size())) {
// Loader is not at end; skip past it.
funpad4(fi); // MATCH01
fi->seek(lsize, SEEK_CUR);
unsigned d_info[4]; fi->readx(d_info, sizeof(d_info));
//if (0==old_dtinit) {
// old_dtinit = d_info[2 + (0==d_info[0])];
//}
fi->seek(lsize - sizeof(d_info), SEEK_CUR);
}
// The gaps between PT_LOAD and after last PT_LOAD
@@ -3606,7 +3610,11 @@ void PackLinuxElf32::unpack(OutputFile *fo)
< up4(fi->st_size())) {
// Loader is not at end; skip past it.
funpad4(fi); // MATCH01
fi->seek(lsize, SEEK_CUR);
unsigned d_info[4]; fi->readx(d_info, sizeof(d_info));
if (0==old_dtinit) {
old_dtinit = d_info[2 + (0==d_info[0])];
}
fi->seek(lsize - sizeof(d_info), SEEK_CUR);
}
// The gaps between PT_LOAD and after last PT_LOAD