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

re-work -fpie for amd64

Browse Source 
modified:   stub/src/amd64-linux.elf-main.c
This commit is contained in:
John Reiser
2017-04-06 14:22:05 -07:00
parent 491e8640b2
commit 3dcdd25177
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/src/amd64-linux.elf-main.c
+20 -5
View File
@@ -325,8 +325,7 @@ upx_main( // returns entry address
Elf64_Addr reloc // IN OUT; value result for ET_DYN Elf64_Addr reloc // IN OUT; value result for ET_DYN
) )
{ {
Elf64_Phdr const *phdr = (Elf64_Phdr const *)(1+ ehdr); Elf64_Phdr *phdr = (Elf64_Phdr *)(1+ ehdr);
Elf64_Addr entry;
Extent xo, xi1, xi2; Extent xo, xi1, xi2;
xo.buf = (char *)ehdr; xo.buf = (char *)ehdr;
@@ -343,11 +342,27 @@ upx_main( // returns entry address
//auxv_up(av, AT_PHENT , ehdr->e_phentsize); /* this can never change */ //auxv_up(av, AT_PHENT , ehdr->e_phentsize); /* this can never change */
//auxv_up(av, AT_PAGESZ, PAGE_SIZE); /* ld-linux.so.2 does not need this */ //auxv_up(av, AT_PAGESZ, PAGE_SIZE); /* ld-linux.so.2 does not need this */
entry = do_xmap(ehdr, &xi1, 0, av, f_decompress, f_unf, &reloc); // "rewind" unsigned const orig_e_type = ehdr->e_type;
auxv_up(av, AT_ENTRY , entry); if (ET_DYN==orig_e_type /*&& phdr->p_vaddr==0*/) { // -fpie /*FIXME: and not pre-linked*/
// Unpacked must start at same place as packed, so that brk(0) works.
ehdr->e_type = ET_EXEC;
auxv_up(av, AT_ENTRY, ehdr->e_entry + reloc);
phdr = (Elf64_Phdr *)(1+ ehdr);
unsigned j;
for (j=0; j < ehdr->e_phnum; ++phdr, ++j) {
phdr->p_vaddr += reloc;
phdr->p_paddr += reloc;
}
}
Elf64_Addr entry = do_xmap(ehdr, &xi1, 0, av, f_decompress, f_unf, &reloc); // "rewind"
if (ET_DYN!=orig_e_type) {
auxv_up(av, AT_ENTRY , entry);
}
{ // Map PT_INTERP program interpreter { // Map PT_INTERP program interpreter
int j; phdr = (Elf64_Phdr *)(1+ ehdr);
unsigned j;
for (j=0; j < ehdr->e_phnum; ++phdr, ++j) if (PT_INTERP==phdr->p_type) { for (j=0; j < ehdr->e_phnum; ++phdr, ++j) if (PT_INTERP==phdr->p_type) {
char const *const iname = reloc + (char const *)phdr->p_vaddr; char const *const iname = reloc + (char const *)phdr->p_vaddr;
int const fdi = open(iname, O_RDONLY, 0); int const fdi = open(iname, O_RDONLY, 0);