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/arm.v5a-linux.elf-fold.map
Vendored
+8 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xb8c
.text 0x0000000000008080 0xb54
*(.text)
.text 0x0000000000008080 0x3ec tmp/arm.v5a-linux.elf-fold.o
0x0000000000008348 munmap
@@ -31,18 +31,18 @@ TARGET(elf32-littlearm)
0x0000000000008410 div10
0x000000000000835c mprotect
0x00000000000082e4 close
.text 0x000000000000846c 0x7a0 tmp/armel-linux.elf-main.o
.text 0x000000000000846c 0x768 tmp/armel-linux.elf-main.o
0x000000000000848c get_page_mask
0x0000000000008ad8 upx_main
0x0000000000008aa0 upx_main
*(.data)
.data 0x0000000000008c0c 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008c0c 0x0 tmp/armel-linux.elf-main.o
.data 0x0000000000008bd4 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008bd4 0x0 tmp/armel-linux.elf-main.o
.data
.bss 0x0000000000008c0c 0x0
.bss 0x0000000000008c0c 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008c0c 0x0 tmp/armel-linux.elf-main.o
.bss 0x0000000000008bd4 0x0
.bss 0x0000000000008bd4 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008bd4 0x0 tmp/armel-linux.elf-main.o
LOAD tmp/arm.v5a-linux.elf-fold.o
LOAD tmp/armel-linux.elf-main.o
OUTPUT(tmp/arm.v5a-linux.elf-fold.bin elf32-littlearm)