Decompression escape hatch for ELF can require a new page.
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:
@@ -9,7 +9,7 @@ Linker script and memory map
|
||||
TARGET(elf32-littlearm)
|
||||
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
|
||||
|
||||
.text 0x0000000000008080 0x9dc
|
||||
.text 0x0000000000008080 0xa44
|
||||
*(.text)
|
||||
.text 0x0000000000008080 0x2f8 tmp/arm.v4a-linux.elf-fold.o
|
||||
0x00000000000082c8 munmap
|
||||
@@ -29,18 +29,18 @@ TARGET(elf32-littlearm)
|
||||
0x000000000000831c div10
|
||||
0x00000000000082d0 mprotect
|
||||
0x00000000000082a0 close
|
||||
.text 0x0000000000008378 0x6e4 tmp/arm.v4a-linux.elf-main.o
|
||||
.text 0x0000000000008378 0x74c tmp/arm.v4a-linux.elf-main.o
|
||||
0x0000000000008398 get_page_mask
|
||||
0x0000000000008928 upx_main
|
||||
0x0000000000008990 upx_main
|
||||
*(.data)
|
||||
.data 0x0000000000008a5c 0x0 tmp/arm.v4a-linux.elf-fold.o
|
||||
.data 0x0000000000008a5c 0x0 tmp/arm.v4a-linux.elf-main.o
|
||||
.data 0x0000000000008ac4 0x0 tmp/arm.v4a-linux.elf-fold.o
|
||||
.data 0x0000000000008ac4 0x0 tmp/arm.v4a-linux.elf-main.o
|
||||
|
||||
.data
|
||||
|
||||
.bss 0x0000000000008a5c 0x0
|
||||
.bss 0x0000000000008a5c 0x0 tmp/arm.v4a-linux.elf-fold.o
|
||||
.bss 0x0000000000008a5c 0x0 tmp/arm.v4a-linux.elf-main.o
|
||||
.bss 0x0000000000008ac4 0x0
|
||||
.bss 0x0000000000008ac4 0x0 tmp/arm.v4a-linux.elf-fold.o
|
||||
.bss 0x0000000000008ac4 0x0 tmp/arm.v4a-linux.elf-main.o
|
||||
LOAD tmp/arm.v4a-linux.elf-fold.o
|
||||
LOAD tmp/arm.v4a-linux.elf-main.o
|
||||
OUTPUT(tmp/arm.v4a-linux.elf-fold.bin elf32-littlearm)
|
||||
|
||||
Reference in New Issue
Block a user