Fix 64-bit ET_EXEC

https://github.com/upx/upx/issues/405
	modified:   p_lx_elf.cpp
	modified:   stub/src/amd64-linux.elf-main.c

	modified:   ../.github/travis_testsuite_1-expected_sha256sums.sh
	modified:   stub/amd64-linux.elf-fold.h
	modified:   stub/arm64-linux.elf-fold.h
	modified:   stub/powerpc64-linux.elf-fold.h
	modified:   stub/powerpc64le-linux.elf-fold.h
	modified:   stub/tmp/amd64-linux.elf-fold.map
	modified:   stub/tmp/arm64-linux.elf-fold.map
	modified:   stub/tmp/powerpc64-linux.elf-fold.map
	modified:   stub/tmp/powerpc64le-linux.elf-fold.map
This commit is contained in:
John Reiser
2020-09-04 10:21:14 -07:00
committed by Markus F.X.J. Oberhumer
parent 89d0fda9fa
commit be61e9f584
11 changed files with 557 additions and 542 deletions
+9 -10
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x868
.text 0x00000000001000bc 0x87c
*(.text)
.text 0x00000000001000bc 0x19d tmp/amd64-linux.elf-fold.o
0x0000000000100249 munmap
@@ -21,20 +21,19 @@ Linker script and memory map
0x000000000010024d mprotect
0x0000000000100241 close
*fill* 0x0000000000100259 0x3 00
.text 0x000000000010025c 0x6c6 tmp/amd64-linux.elf-main.o
0x00000000001007da upx_main
.text 0x000000000010025c 0x6dc tmp/amd64-linux.elf-main.o
0x00000000001007f0 upx_main
*(.data)
*fill* 0x0000000000100922 0x2 00
.data 0x0000000000100924 0x0 tmp/amd64-linux.elf-fold.o
.data 0x0000000000100924 0x0 tmp/amd64-linux.elf-main.o
.data 0x0000000000100938 0x0 tmp/amd64-linux.elf-fold.o
.data 0x0000000000100938 0x0 tmp/amd64-linux.elf-main.o
.data
.bss 0x0000000000100924 0x0
.bss 0x0000000000100924 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x0000000000100924 0x0 tmp/amd64-linux.elf-main.o
.bss 0x0000000000100938 0x0
.bss 0x0000000000100938 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x0000000000100938 0x0 tmp/amd64-linux.elf-main.o
.rela.dyn 0x0000000000100928 0x0
.rela.dyn 0x0000000000100938 0x0
.rela.text 0x0000000000000000 0x0 tmp/amd64-linux.elf-fold.o
LOAD tmp/amd64-linux.elf-fold.o
LOAD tmp/amd64-linux.elf-main.o
+14 -14
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x9c8
.text 0x00000000001000bc 0x9dc
*(.text)
.text 0x00000000001000bc 0x24c tmp/arm64-linux.elf-fold.o
0x000000000010023c my_bkpt
@@ -26,26 +26,26 @@ Linker script and memory map
0x00000000001002d0 readlink
0x00000000001002d8 open
0x00000000001002f4 __clear_cache
.text 0x0000000000100308 0x77c tmp/arm64-linux.elf-main.o
0x000000000010091c upx_main
.text 0x0000000000100308 0x790 tmp/arm64-linux.elf-main.o
0x0000000000100930 upx_main
*(.data)
.data 0x0000000000100a84 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100a84 0x0 tmp/arm64-linux.elf-main.o
.data 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100a98 0x0 tmp/arm64-linux.elf-main.o
.iplt 0x0000000000100a84 0x0
.iplt 0x0000000000100a84 0x0 tmp/arm64-linux.elf-fold.o
.iplt 0x0000000000100a98 0x0
.iplt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100a88 0x0
.rela.iplt 0x0000000000100a88 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100a98 0x0
.rela.iplt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.data
LOAD tmp/arm64-linux.elf-fold.o
LOAD tmp/arm64-linux.elf-main.o
OUTPUT(tmp/arm64-linux.elf-fold.bin elf64-littleaarch64)
.igot.plt 0x0000000000100a88 0x0
.igot.plt 0x0000000000100a88 0x0 tmp/arm64-linux.elf-fold.o
.igot.plt 0x0000000000100a98 0x0
.igot.plt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100a84 0x0
.bss 0x0000000000100a84 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100a84 0x0 tmp/arm64-linux.elf-main.o
.bss 0x0000000000100a98 0x0
.bss 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100a98 0x0 tmp/arm64-linux.elf-main.o
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xb70
.text 0x00000000001000bc 0xb94
*(.text)
.text 0x00000000001000bc 0x330 tmp/powerpc64-linux.elf-fold.o
0x00000000001000bc get_page_mask
@@ -23,47 +23,47 @@ TARGET(elf64-powerpc)
0x00000000001003d4 mprotect
0x00000000001003dc munmap
0x00000000001003e4 my_bkpt
.text 0x00000000001003ec 0x840 tmp/powerpc64-linux.elf-main.o
.text 0x00000000001003ec 0x864 tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100c2c 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100c2c 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100c50 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100c50 0x0 tmp/powerpc64-linux.elf-main.o
.sfpr 0x0000000000100c2c 0xa4
.sfpr 0x0000000000100c2c 0xa4 linker stubs
0x0000000000100c2c _savegpr0_14
0x0000000000100c54 _savegpr0_24
0x0000000000100c64 _savegpr0_28
0x0000000000100c7c _restgpr0_14
0x0000000000100ca4 _restgpr0_24
0x0000000000100cb4 _restgpr0_28
.sfpr 0x0000000000100c50 0xa4
.sfpr 0x0000000000100c50 0xa4 linker stubs
0x0000000000100c50 _savegpr0_14
0x0000000000100c78 _savegpr0_24
0x0000000000100c88 _savegpr0_28
0x0000000000100ca0 _restgpr0_14
0x0000000000100cc8 _restgpr0_24
0x0000000000100cd8 _restgpr0_28
.glink 0x0000000000100cd0 0x0
.glink 0x0000000000100cd0 0x0 linker stubs
.glink 0x0000000000100cf8 0x0
.glink 0x0000000000100cf8 0x0 linker stubs
.eh_frame 0x0000000000100cd0 0x0
.eh_frame 0x0000000000100cd0 0x0 linker stubs
.eh_frame 0x0000000000100cf4 0x0
.eh_frame 0x0000000000100cf4 0x0 linker stubs
.rela.dyn 0x0000000000100cd0 0x0
.rela.iplt 0x0000000000100cd0 0x0 linker stubs
.rela.dyn 0x0000000000100cf8 0x0
.rela.iplt 0x0000000000100cf8 0x0 linker stubs
.data
LOAD tmp/powerpc64-linux.elf-fold.o
LOAD tmp/powerpc64-linux.elf-main.o
OUTPUT(tmp/powerpc64-linux.elf-fold.bin elf64-powerpc)
.branch_lt 0x0000000000100cd0 0x0
.branch_lt 0x0000000000100cd0 0x0 linker stubs
.branch_lt 0x0000000000100cf8 0x0
.branch_lt 0x0000000000100cf8 0x0 linker stubs
.toc 0x0000000000100cd0 0x0
.toc 0x0000000000100cd0 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100cf8 0x0
.toc 0x0000000000100cf8 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100cd0 0x58
.opd 0x0000000000100cd0 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d10 upx_main
.opd 0x0000000000100cf8 0x58
.opd 0x0000000000100cf8 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d38 upx_main
.iplt 0x0000000000100d28 0x0
.iplt 0x0000000000100d28 0x0 linker stubs
.iplt 0x0000000000100d50 0x0
.iplt 0x0000000000100d50 0x0 linker stubs
.bss 0x0000000000100d28 0x0
.bss 0x0000000000100d28 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100d28 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100d50 0x0
.bss 0x0000000000100d50 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100d50 0x0 tmp/powerpc64-linux.elf-main.o
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpcle)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xb6c
.text 0x00000000001000bc 0xb90
*(.text)
.text 0x00000000001000bc 0x330 tmp/powerpc64le-linux.elf-fold.o
0x00000000001000bc get_page_mask
@@ -23,47 +23,47 @@ TARGET(elf64-powerpcle)
0x00000000001003d4 mprotect
0x00000000001003dc munmap
0x00000000001003e4 my_bkpt
.text 0x00000000001003ec 0x83c tmp/powerpc64le-linux.elf-main.o
.text 0x00000000001003ec 0x860 tmp/powerpc64le-linux.elf-main.o
*(.data)
.data 0x0000000000100c28 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100c28 0x0 tmp/powerpc64le-linux.elf-main.o
.data 0x0000000000100c4c 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100c4c 0x0 tmp/powerpc64le-linux.elf-main.o
.sfpr 0x0000000000100c28 0xa4
.sfpr 0x0000000000100c28 0xa4 linker stubs
0x0000000000100c28 _savegpr0_14
0x0000000000100c50 _savegpr0_24
0x0000000000100c60 _savegpr0_28
0x0000000000100c78 _restgpr0_14
0x0000000000100ca0 _restgpr0_24
0x0000000000100cb0 _restgpr0_28
.sfpr 0x0000000000100c4c 0xa4
.sfpr 0x0000000000100c4c 0xa4 linker stubs
0x0000000000100c4c _savegpr0_14
0x0000000000100c74 _savegpr0_24
0x0000000000100c84 _savegpr0_28
0x0000000000100c9c _restgpr0_14
0x0000000000100cc4 _restgpr0_24
0x0000000000100cd4 _restgpr0_28
.glink 0x0000000000100cd0 0x0
.glink 0x0000000000100cd0 0x0 linker stubs
.glink 0x0000000000100cf0 0x0
.glink 0x0000000000100cf0 0x0 linker stubs
.eh_frame 0x0000000000100ccc 0x0
.eh_frame 0x0000000000100ccc 0x0 linker stubs
.eh_frame 0x0000000000100cf0 0x0
.eh_frame 0x0000000000100cf0 0x0 linker stubs
.rela.dyn 0x0000000000100cd0 0x0
.rela.iplt 0x0000000000100cd0 0x0 linker stubs
.rela.dyn 0x0000000000100cf0 0x0
.rela.iplt 0x0000000000100cf0 0x0 linker stubs
.data
LOAD tmp/powerpc64le-linux.elf-fold.o
LOAD tmp/powerpc64le-linux.elf-main.o
OUTPUT(tmp/powerpc64le-linux.elf-fold.bin elf64-powerpcle)
.branch_lt 0x0000000000100cd0 0x0
.branch_lt 0x0000000000100cd0 0x0 linker stubs
.branch_lt 0x0000000000100cf0 0x0
.branch_lt 0x0000000000100cf0 0x0 linker stubs
.toc 0x0000000000100cd0 0x0
.toc 0x0000000000100cd0 0x0 tmp/powerpc64le-linux.elf-main.o
.toc 0x0000000000100cf0 0x0
.toc 0x0000000000100cf0 0x0 tmp/powerpc64le-linux.elf-main.o
.opd 0x0000000000100cd0 0x58
.opd 0x0000000000100cd0 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100d10 upx_main
.opd 0x0000000000100cf0 0x58
.opd 0x0000000000100cf0 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100d30 upx_main
.iplt 0x0000000000100d28 0x0
.iplt 0x0000000000100d28 0x0 linker stubs
.iplt 0x0000000000100d48 0x0
.iplt 0x0000000000100d48 0x0 linker stubs
.bss 0x0000000000100d28 0x0
.bss 0x0000000000100d28 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100d28 0x0 tmp/powerpc64le-linux.elf-main.o
.bss 0x0000000000100d48 0x0
.bss 0x0000000000100d48 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100d48 0x0 tmp/powerpc64le-linux.elf-main.o