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

dynamic e_phnum for arm64

Browse Source 
modified:   stub/src/arm64-linux.elf-entry.S
	modified:   stub/src/arm64-linux.elf-fold.S

	modified:   stub/arm64-linux.elf-entry.h
	modified:   stub/tmp/arm64-linux.elf-entry.bin.dump
This commit is contained in:
John Reiser
2017-04-30 13:13:53 -07:00
parent cd11bb1606
commit f7ffae565c
4 changed files with 570 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/arm64-linux.elf-entry.h
+542 -541
View File
File diff suppressed because it is too large Load Diff
src/stub/src/arm64-linux.elf-entry.S
+15 -9
View File
@@ -31,8 +31,9 @@
#include "arch/arm64/v8/macros.S" #include "arch/arm64/v8/macros.S"
sz_Elf64_Ehdr= 64
sz_Elf64_Phdr= 56 sz_Elf64_Phdr= 56
sz_Elf64_Ehdr= 64
e_phnum= 16 + 2*2 + 4 + 3*8 + 4 + 2*2
sz_b_info= 12 sz_b_info= 12
sz_unc= 0 sz_unc= 0
@@ -69,6 +70,7 @@ mflg:
.long MFLG // MAP_{PRIVATE|ANONYMOUS} // QNX vs linux .long MFLG // MAP_{PRIVATE|ANONYMOUS} // QNX vs linux
.xword ADRM // dst for map .xword ADRM // dst for map
_start: .globl _start _start: .globl _start
//// brk #0 // DEBUG
/* Get some pages: enough /* Get some pages: enough
to duplicate the entire compressed PT_LOAD, plus 1 page, located just after to duplicate the entire compressed PT_LOAD, plus 1 page, located just after
the brk() of the _un_compressed program. The address is pre-calculated the brk() of the _un_compressed program. The address is pre-calculated
@@ -86,14 +88,14 @@ _start: .globl _start
#endif /*}*/ #endif /*}*/
adr x12,start_params -4 // &sz_pack2 adr x12,start_params -4 // &sz_pack2
ldp w1,w10,[x12] // w1= sz_pack2; w10= LENF ldp w29,w10,[x12] // w29= sz_pack2; w10= LENF
ldp w11,w13,[x12,#2*4] // w11= CPRO; w13= MFLG ldp w11,w13,[x12,#2*4] // w11= CPRO; w13= MFLG
add x11,x11,x12 // cpr0 add x11,x11,x12 // cpr0
ldr x0,[x12,#4*4] // ADRM
add x10,x10,x12 // end_decompress add x10,x10,x12 // end_decompress
ldr w3,[x11,# sz_unc] ldr w3,[x11,# sz_unc]
sub x9,x12,x1 // &our_Elf64_Ehdr sub x12,x12,w29,uxtw // &our_Elf64_Ehdr
add w1,w1,w3 // sz_pack2 + cpr0.sz_unc add w1,w29,w3 // sz_pack2 + cpr0.sz_unc
ldr x0,[x12,#4*4] // ADRM
add x1,x1,# PAGE_SIZE add x1,x1,# PAGE_SIZE
section LUNMP000 section LUNMP000
// unused // unused
@@ -113,6 +115,7 @@ D_sz_unc=2*8 // stack displacement to sz_unc
#endif /*}*/ #endif /*}*/
cmn x0,#4096 cmn x0,#4096
bcs msg_SELinux bcs msg_SELinux
mov x9,x12 // &our_Elf64_Ehdr
copy_cl: // copy decompressor and folded code copy_cl: // copy decompressor and folded code
add x5,x0,#64; // FIXME(memcheck) dc zva,x5 // clear FOLLOWING 64-byte line add x5,x0,#64; // FIXME(memcheck) dc zva,x5 // clear FOLLOWING 64-byte line
ldp x1,x2,[x9],#2*8 ldp x1,x2,[x9],#2*8
@@ -130,14 +133,17 @@ copy_cl: // copy decompressor and folded code
sub x4,x0,x9 // relocation amount sub x4,x0,x9 // relocation amount
ldr w1,[sp,#SP_MFLG] ldr w1,[sp,#SP_MFLG]
adr x15,f_decompress
str w1,[x0],#4 // MFLG at -4+ fold_begin str w1,[x0],#4 // MFLG at -4+ fold_begin
adr x15,f_decompress
mov lr,x0 // dst for unfolded code mov lr,x0 // dst for unfolded code
add x15,x15,x4 // relocated f_decompress add x15,x15,x4 // relocated f_decompress
ldr w9,[x12] // sz_pack2 ldrh w9,[x12,#e_phnum]
sub w9,w9,#sz_Elf64_Ehdr + 2*sz_Elf64_Phdr + sz_l_info + sz_p_info mov w10,#sz_Elf64_Phdr
sub x10,x12,x9 // &b_info mul w10,w10,w9
add w10,w10,#sz_Elf64_Ehdr + sz_l_info + sz_p_info
add x10,x12,w10,uxtw // &b_info
sub w9,w29,w10 // total compressed size
add x10,x10,x4 // relocated &b_info add x10,x10,x4 // relocated &b_info
ldr w4,[x11,# b_method ] // 5th param (whole word: endian issues!) ldr w4,[x11,# b_method ] // 5th param (whole word: endian issues!)
src/stub/src/arm64-linux.elf-fold.S
+1
View File
@@ -62,6 +62,7 @@ PAGE_SIZE = -(~0<<PAGE_SHIFT)
#define MAX_ELF_HDR 512 #define MAX_ELF_HDR 512
fold_begin: fold_begin:
//// brk #0 // DEBUG
/* In: /* In:
r15= f_decompress r15= f_decompress
r10= &b_info of first compressed block (after move) r10= &b_info of first compressed block (after move)
src/stub/tmp/arm64-linux.elf-entry.bin.dump
+12 -12
View File
@@ -5,18 +5,18 @@ Idx Name Size VMA LMA File off Algn
0 ELFMAINX 0000003c 0000000000000000 0000000000000000 00000040 2**0 CONTENTS, RELOC, READONLY 0 ELFMAINX 0000003c 0000000000000000 0000000000000000 00000040 2**0 CONTENTS, RELOC, READONLY
1 LUNMP000 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY 1 LUNMP000 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY
2 LUNMP001 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY 2 LUNMP001 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY
3 ELFMAINXu 000000a0 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, RELOC, READONLY 3 ELFMAINXu 000000b0 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, RELOC, READONLY
4 NRV_HEAD 00000000 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY 4 NRV_HEAD 00000000 0000000000000000 0000000000000000 0000012c 2**0 CONTENTS, READONLY
5 NRV_TAIL 00000000 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY 5 NRV_TAIL 00000000 0000000000000000 0000000000000000 0000012c 2**0 CONTENTS, READONLY
6 NRV2E 00000128 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY 6 NRV2E 00000128 0000000000000000 0000000000000000 0000012c 2**0 CONTENTS, READONLY
7 NRV2D 0000011c 0000000000000000 0000000000000000 00000244 2**0 CONTENTS, READONLY 7 NRV2D 0000011c 0000000000000000 0000000000000000 00000254 2**0 CONTENTS, READONLY
8 NRV2B 000000f0 0000000000000000 0000000000000000 00000360 2**0 CONTENTS, READONLY 8 NRV2B 000000f0 0000000000000000 0000000000000000 00000370 2**0 CONTENTS, READONLY
9 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000450 2**0 CONTENTS, RELOC, READONLY 9 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000460 2**0 CONTENTS, RELOC, READONLY
10 LZMA_DEC20 00000968 0000000000000000 0000000000000000 00000520 2**0 CONTENTS, READONLY 10 LZMA_DEC20 00000968 0000000000000000 0000000000000000 00000530 2**0 CONTENTS, READONLY
11 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000e88 2**0 CONTENTS, READONLY 11 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000e98 2**0 CONTENTS, READONLY
12 LZMA_DEC30 00000000 0000000000000000 0000000000000000 00001324 2**0 CONTENTS, READONLY 12 LZMA_DEC30 00000000 0000000000000000 0000000000000000 00001334 2**0 CONTENTS, READONLY
13 ELFMAINY 0000003e 0000000000000000 0000000000000000 00001324 2**0 CONTENTS, READONLY 13 ELFMAINY 0000003e 0000000000000000 0000000000000000 00001334 2**0 CONTENTS, READONLY
14 ELFMAINZ 00000000 0000000000000000 0000000000000000 00001362 2**0 CONTENTS, READONLY 14 ELFMAINZ 00000000 0000000000000000 0000000000000000 00001372 2**0 CONTENTS, READONLY
SYMBOL TABLE: SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30 0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d ELFMAINY 0000000000000000 ELFMAINY 0000000000000000 l d ELFMAINY 0000000000000000 ELFMAINY