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

Fix brk+munmap in folded stubs for main programs

Browse Source 
qemu emulating a compressed ET_EXEC revealed an access to ElfXX_Phdr
on the discarded side of brk() during cleanup. qemu was more aggressive
than the Linux kernel implementation of brk().
        https://github.com/upx/upx/issues/683

	modified:   stub/src/i386-linux.elf-main.c
	modified:   stub/src/include/linux.h

	modified:   ../misc/testsuite/upx_testsuite_1-expected_sha256sums.sh

	modified:   stub/src/amd64-linux.elf-fold.S
	modified:   stub/src/arm.v4a-linux.elf-fold.S
	modified:   stub/src/arm64-linux.elf-fold.S
	modified:   stub/src/i386-linux.elf-fold.S
	modified:   stub/src/mipsel.r3000-linux.elf-fold.S
	modified:   stub/src/powerpc-linux.elf-fold.S
	modified:   stub/src/powerpc64le-linux.elf-fold.S

	modified:   stub/amd64-linux.elf-fold.h
	modified:   stub/arm.v4a-linux.elf-fold.h
	modified:   stub/arm.v5a-linux.elf-fold.h
	modified:   stub/arm64-linux.elf-fold.h
	modified:   stub/armeb.v4a-linux.elf-fold.h
	modified:   stub/i386-linux.elf-fold.h
	modified:   stub/mips.r3000-linux.elf-fold.h
	modified:   stub/mipsel.r3000-linux.elf-fold.h
	modified:   stub/powerpc-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/arm.v4a-linux.elf-fold.map
	modified:   stub/tmp/arm.v5a-linux.elf-fold.map
	modified:   stub/tmp/arm64-linux.elf-fold.map
	modified:   stub/tmp/armeb.v4a-linux.elf-fold.map
	modified:   stub/tmp/i386-linux.elf-fold.map
	modified:   stub/tmp/mips.r3000-linux.elf-fold.map
	modified:   stub/tmp/mipsel.r3000-linux.elf-fold.map
	modified:   stub/tmp/powerpc-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
2023-07-16 16:39:52 -07:00
committed by Markus F.X.J. Oberhumer
parent 3f7f26c74b
commit 067895fa5f
32 changed files with 2190 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/tmp/arm64-linux.elf-fold.map
Vendored
+31 -31
View File
@@ -8,45 +8,45 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xa3c
.text 0x00000000001000bc 0xa50
*(.text)
.text 0x00000000001000bc 0x280 tmp/arm64-linux.elf-fold.o
0x0000000000100258 my_bkpt
0x0000000000100260 exit
0x0000000000100268 read
0x0000000000100274 write
0x0000000000100280 close
0x000000000010028c getpid
0x0000000000100298 brk
0x00000000001002a4 munmap
0x00000000001002b0 Pprotect
0x00000000001002b0 mprotect
0x00000000001002c8 mmap_privanon
0x00000000001002d8 mmap
0x00000000001002f0 unlink
0x0000000000100304 readlink
0x000000000010030c open
0x0000000000100328 __clear_cache
.text 0x000000000010033c 0x7bc tmp/arm64-linux.elf-main.o
0x0000000000100990 upx_main
.text 0x00000000001000bc 0x294 tmp/arm64-linux.elf-fold.o
0x000000000010026c my_bkpt
0x0000000000100274 exit
0x000000000010027c read
0x0000000000100288 write
0x0000000000100294 close
0x00000000001002a0 getpid
0x00000000001002ac brk
0x00000000001002b8 munmap
0x00000000001002c4 Pprotect
0x00000000001002c4 mprotect
0x00000000001002dc mmap_privanon
0x00000000001002ec mmap
0x0000000000100304 unlink
0x0000000000100318 readlink
0x0000000000100320 open
0x000000000010033c __clear_cache
.text 0x0000000000100350 0x7bc tmp/arm64-linux.elf-main.o
0x00000000001009a4 upx_main
*(.data)
.data 0x0000000000100af8 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100af8 0x0 tmp/arm64-linux.elf-main.o
.data 0x0000000000100b0c 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100b0c 0x0 tmp/arm64-linux.elf-main.o
.iplt 0x0000000000100af8 0x0
.iplt 0x0000000000100af8 0x0 tmp/arm64-linux.elf-fold.o
.iplt 0x0000000000100b0c 0x0
.iplt 0x0000000000100b0c 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100af8 0x0
.rela.iplt 0x0000000000100af8 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100b10 0x0
.rela.iplt 0x0000000000100b10 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 0x0000000000100af8 0x0
.igot.plt 0x0000000000100af8 0x0 tmp/arm64-linux.elf-fold.o
.igot.plt 0x0000000000100b10 0x0
.igot.plt 0x0000000000100b10 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100af8 0x0
.bss 0x0000000000100af8 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100af8 0x0 tmp/arm64-linux.elf-main.o
.bss 0x0000000000100b0c 0x0
.bss 0x0000000000100b0c 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100b0c 0x0 tmp/arm64-linux.elf-main.o