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

ELF shared lib: PT_DYNAMIC might be below xct_off, such as MIPS

Browse Source 
https://github.com/upx/upx/issues/298
	modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2020-02-15 15:04:44 -08:00
parent 4fb1d41be8
commit b72eac69a5
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+12
View File
@@ -439,6 +439,12 @@ off_t PackLinuxElf32::pack3(OutputFile *fo, Filter &ft)
if ((xct_off - ioff) < len) { // Change length of compressed PT_LOAD. if ((xct_off - ioff) < len) { // Change length of compressed PT_LOAD.
set_te32(&phdr->p_filesz, sz_pack2 + lsize - ioff); set_te32(&phdr->p_filesz, sz_pack2 + lsize - ioff);
set_te32(&phdr->p_memsz, sz_pack2 + lsize - ioff); set_te32(&phdr->p_memsz, sz_pack2 + lsize - ioff);
if (user_init_off < xct_off) { // MIPS puts PT_DYNAMIC here
// Allow for DT_INIT in a new [stolen] slot
unsigned off2 = user_init_off - sizeof(word);
fo->seek(off2, SEEK_SET);
fo->rewrite(&file_image[off2], 2*sizeof(word));
}
} }
else if (xct_off < ioff) { // Slide subsequent PT_LOAD. else if (xct_off < ioff) { // Slide subsequent PT_LOAD.
if ((1u<<12) < align) { if ((1u<<12) < align) {
@@ -564,6 +570,12 @@ off_t PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
if ((xct_off - ioff) < len) { // Change length of compressed PT_LOAD. if ((xct_off - ioff) < len) { // Change length of compressed PT_LOAD.
set_te64(&phdr->p_filesz, sz_pack2 + lsize - ioff); set_te64(&phdr->p_filesz, sz_pack2 + lsize - ioff);
set_te64(&phdr->p_memsz, sz_pack2 + lsize - ioff); set_te64(&phdr->p_memsz, sz_pack2 + lsize - ioff);
if (user_init_off < xct_off) { // MIPS puts PT_DYNAMIC here
// Allow for DT_INIT in a new [stolen] slot
unsigned off2 = user_init_off - sizeof(word);
fo->seek(off2, SEEK_SET);
fo->rewrite(&file_image[off2], 2*sizeof(word));
}
} }
else if (xct_off < ioff) { // Slide subsequent PT_LOAD. else if (xct_off < ioff) { // Slide subsequent PT_LOAD.
// AMD64 chip supports page sizes of 4KiB, 2MiB, and 1GiB; // AMD64 chip supports page sizes of 4KiB, 2MiB, and 1GiB;