Fix brk+munmap in folded stubs for main programs

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
+8 -8
View File
@@ -9,21 +9,21 @@ Linker script and memory map
TARGET(elf32-bigmips)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0xb00
.text 0x0000000000100080 0xad0
*(.text)
.text 0x0000000000100080 0x1c0 tmp/mips.r3000-linux.elf-fold.o
0x0000000000100218 Pprotect
.text 0x0000000000100240 0x940 tmp/mips.r3000-linux.elf-main.o
0x00000000001009e4 upx_main
.text 0x0000000000100240 0x910 tmp/mips.r3000-linux.elf-main.o
0x00000000001009b0 upx_main
*(.data)
.data 0x0000000000100b80 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100b80 0x0 tmp/mips.r3000-linux.elf-main.o
.data 0x0000000000100b50 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100b50 0x0 tmp/mips.r3000-linux.elf-main.o
.data
.bss 0x0000000000100b80 0x0
.bss 0x0000000000100b80 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100b80 0x0 tmp/mips.r3000-linux.elf-main.o
.bss 0x0000000000100b50 0x0
.bss 0x0000000000100b50 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100b50 0x0 tmp/mips.r3000-linux.elf-main.o
LOAD tmp/mips.r3000-linux.elf-fold.o
LOAD tmp/mips.r3000-linux.elf-main.o
OUTPUT(tmp/mips.r3000-linux.elf-fold.bin elf32-bigmips)