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

Decompression escape hatch for ELF can require a new page.

Browse Source 
If not enough room on last page of .text, and ElfXX_Ehdr not PF_X,
then the escape hatch must use a new page.
https://github.com/upx/upx/issues/308
	modified:   ../.github/travis_testsuite_1-expected_sha256sums.sh
	modified:   stub/src/amd64-linux.elf-main.c
	modified:   stub/src/i386-linux.elf-main.c
    Plus stub/*-linux.elf-fold.h and stub/tmp/*-linux.elf-fold.map
This commit is contained in:
John Reiser
2020-01-19 13:25:55 -08:00
parent fdf2eddc73
commit 936013f60c
25 changed files with 1494 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/tmp/powerpc64-linux.elf-fold.map
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xab4
.text 0x00000000001000bc 0xb04
*(.text)
.text 0x00000000001000bc 0x30c tmp/powerpc64-linux.elf-fold.o
0x00000000001000bc get_page_mask
@@ -23,47 +23,47 @@ TARGET(elf64-powerpc)
0x00000000001003b0 mprotect
0x00000000001003b8 munmap
0x00000000001003c0 my_bkpt
.text 0x00000000001003c8 0x7a8 tmp/powerpc64-linux.elf-main.o
.text 0x00000000001003c8 0x7f8 tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100b70 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100b70 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100bc0 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100bc0 0x0 tmp/powerpc64-linux.elf-main.o
.sfpr 0x0000000000100b70 0xa4
.sfpr 0x0000000000100b70 0xa4 linker stubs
0x0000000000100b70 _savegpr0_14
0x0000000000100b98 _savegpr0_24
0x0000000000100ba8 _savegpr0_28
0x0000000000100bc0 _restgpr0_14
0x0000000000100be8 _restgpr0_24
0x0000000000100bf8 _restgpr0_28
.sfpr 0x0000000000100bc0 0xa4
.sfpr 0x0000000000100bc0 0xa4 linker stubs
0x0000000000100bc0 _savegpr0_14
0x0000000000100be8 _savegpr0_24
0x0000000000100bf8 _savegpr0_28
0x0000000000100c10 _restgpr0_14
0x0000000000100c38 _restgpr0_24
0x0000000000100c48 _restgpr0_28
.glink 0x0000000000100c18 0x0
.glink 0x0000000000100c18 0x0 linker stubs
.glink 0x0000000000100c68 0x0
.glink 0x0000000000100c68 0x0 linker stubs
.eh_frame 0x0000000000100c14 0x0
.eh_frame 0x0000000000100c14 0x0 linker stubs
.eh_frame 0x0000000000100c64 0x0
.eh_frame 0x0000000000100c64 0x0 linker stubs
.rela.dyn 0x0000000000100c18 0x0
.rela.iplt 0x0000000000100c18 0x0 linker stubs
.rela.dyn 0x0000000000100c68 0x0
.rela.iplt 0x0000000000100c68 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 0x0000000000100c18 0x0
.branch_lt 0x0000000000100c18 0x0 linker stubs
.branch_lt 0x0000000000100c68 0x0
.branch_lt 0x0000000000100c68 0x0 linker stubs
.toc 0x0000000000100c18 0x0
.toc 0x0000000000100c18 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100c68 0x0
.toc 0x0000000000100c68 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100c18 0x58
.opd 0x0000000000100c18 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100c58 upx_main
.opd 0x0000000000100c68 0x58
.opd 0x0000000000100c68 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100ca8 upx_main
.iplt 0x0000000000100c70 0x0
.iplt 0x0000000000100c70 0x0 linker stubs
.iplt 0x0000000000100cc0 0x0
.iplt 0x0000000000100cc0 0x0 linker stubs
.bss 0x0000000000100c70 0x0
.bss 0x0000000000100c70 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100c70 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100cc0 0x0
.bss 0x0000000000100cc0 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100cc0 0x0 tmp/powerpc64-linux.elf-main.o