Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/powerpc64-linux.elf-fold.map
Vendored
+42 -42
View File
@@ -9,62 +9,62 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xbe8
.text 0x00000000001000bc 0xbf0
*(.text)
.text 0x00000000001000bc 0x338 tmp/powerpc64-linux.elf-fold.o
.text 0x00000000001000bc 0x340 tmp/powerpc64-linux.elf-fold.o
0x00000000001000bc get_page_mask
0x0000000000100384 mmap
0x000000000010039c Pprotect
0x000000000010039c mprotect
0x00000000001003b4 exit
0x00000000001003bc brk
0x00000000001003c4 readlink
0x00000000001003cc read
0x00000000001003d4 open
0x00000000001003dc close
0x00000000001003e4 munmap
0x00000000001003ec my_bkpt
.text 0x00000000001003f4 0x8b0 tmp/powerpc64-linux.elf-main.o
0x000000000010038c mmap
0x00000000001003a4 Pprotect
0x00000000001003a4 mprotect
0x00000000001003bc exit
0x00000000001003c4 brk
0x00000000001003cc readlink
0x00000000001003d4 read
0x00000000001003dc open
0x00000000001003e4 close
0x00000000001003ec munmap
0x00000000001003f4 my_bkpt
.text 0x00000000001003fc 0x8b0 tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100ca4 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100ca4 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100cac 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100cac 0x0 tmp/powerpc64-linux.elf-main.o
.sfpr 0x0000000000100ca4 0xa4
.sfpr 0x0000000000100ca4 0xa4 linker stubs
0x0000000000100ca4 _savegpr0_14
0x0000000000100ccc _savegpr0_24
0x0000000000100cdc _savegpr0_28
0x0000000000100cf4 _restgpr0_14
0x0000000000100d1c _restgpr0_24
0x0000000000100d2c _restgpr0_28
.sfpr 0x0000000000100cac 0xa4
.sfpr 0x0000000000100cac 0xa4 linker stubs
0x0000000000100cac _savegpr0_14
0x0000000000100cd4 _savegpr0_24
0x0000000000100ce4 _savegpr0_28
0x0000000000100cfc _restgpr0_14
0x0000000000100d24 _restgpr0_24
0x0000000000100d34 _restgpr0_28
.glink 0x0000000000100d48 0x0
.glink 0x0000000000100d48 0x0 linker stubs
.glink 0x0000000000100d50 0x0
.glink 0x0000000000100d50 0x0 linker stubs
.eh_frame 0x0000000000100d48 0x0
.eh_frame 0x0000000000100d48 0x0 linker stubs
.eh_frame 0x0000000000100d50 0x0
.eh_frame 0x0000000000100d50 0x0 linker stubs
.rela.dyn 0x0000000000100d48 0x0
.rela.iplt 0x0000000000100d48 0x0 linker stubs
.rela.dyn 0x0000000000100d50 0x0
.rela.iplt 0x0000000000100d50 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 0x0000000000100d48 0x0
.branch_lt 0x0000000000100d48 0x0 linker stubs
.branch_lt 0x0000000000100d50 0x0
.branch_lt 0x0000000000100d50 0x0 linker stubs
.toc 0x0000000000100d48 0x0
.toc 0x0000000000100d48 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100d50 0x0
.toc 0x0000000000100d50 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100d48 0x58
.opd 0x0000000000100d48 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d88 upx_main
.opd 0x0000000000100d50 0x58
.opd 0x0000000000100d50 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d90 upx_main
.iplt 0x0000000000100da0 0x0
.iplt 0x0000000000100da0 0x0 linker stubs
.iplt 0x0000000000100da8 0x0
.iplt 0x0000000000100da8 0x0 linker stubs
.bss 0x0000000000100da0 0x0
.bss 0x0000000000100da0 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100da0 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100da8 0x0
.bss 0x0000000000100da8 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100da8 0x0 tmp/powerpc64-linux.elf-main.o