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

--android-shlib fix Elf64_Shdr.sh_offset

Browse Source 
https://github.com/upx/upx/issues/100
	modified:   ../p_lx_elf.cpp
	modified:   ../p_lx_elf.h
This commit is contained in:
John Reiser
2017-05-31 11:04:56 -07:00
parent 33f0b6da67
commit b7c91941b8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+5 -5
View File
@@ -447,7 +447,7 @@ void PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
unsigned off = fo->st_size();
unsigned off_init = 0; // where in file
upx_uint64_t va_init = sz_pack2; // virtual address
upx_uint64_t rel = 0;
so_slide = 0;
for (int j = e_phnum; --j>=0; ++phdr) {
upx_uint64_t const len = get_te64(&phdr->p_filesz);
upx_uint64_t const ioff = get_te64(&phdr->p_offset);
@@ -477,8 +477,8 @@ void PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
off += (align-1) & (ioff - off);
fi->seek(ioff, SEEK_SET); fi->readx(ibuf, len);
fo->seek( off, SEEK_SET); fo->write(ibuf, len);
rel = off - ioff;
set_te64(&phdr->p_offset, rel + ioff);
so_slide = off - ioff;
set_te64(&phdr->p_offset, so_slide + ioff);
}
else { // Change length of first PT_LOAD.
va_init += get_te64(&phdr->p_vaddr);
@@ -489,7 +489,7 @@ void PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
}
// Compute new offset of &DT_INIT.d_val.
if (phdr->PT_DYNAMIC==type) {
off_init = rel + ioff;
off_init = so_slide + ioff;
fi->seek(ioff, SEEK_SET);
fi->read(ibuf, len);
Elf64_Dyn *dyn = (Elf64_Dyn *)(void *)ibuf;
@@ -504,7 +504,7 @@ void PackLinuxElf64::pack3(OutputFile *fo, Filter &ft)
// fall through to relocate .p_offset
}
if (xct_off < ioff)
set_te64(&phdr->p_offset, rel + ioff);
set_te64(&phdr->p_offset, so_slide + ioff);
}
if (off_init) { // change DT_INIT.d_val
fo->seek(off_init, SEEK_SET);
src/p_lx_elf.h
+1 -1
View File
@@ -278,7 +278,7 @@ protected:
Elf64_Phdr const *gnu_stack; // propagate NX
upx_uint64_t e_phoff;
upx_uint64_t e_shoff;
unsigned so_slide;
upx_uint64_t so_slide;
unsigned char *note_body; // concatenated contents of PT_NOTEs, if any
unsigned note_size; // total size of PT_NOTEs
upx_uint64_t page_mask; // AND clears the offset-within-page