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
+14 -14
View File
@@ -9,26 +9,26 @@ Linker script and memory map
TARGET(elf32-i386)
0x0000000000c01080 . = ((0xc01000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000c01080 0x770
.text 0x0000000000c01080 0x764
*(.text)
.text 0x0000000000c01080 0x184 tmp/i386-linux.elf-fold.o
0x0000000000c011d6 mmap
0x0000000000c011ae Pprotect
.text 0x0000000000c01204 0x5e9 tmp/i386-linux.elf-main.o
0x0000000000c0132c get_page_mask
0x0000000000c016e3 upx_main
.text 0x0000000000c01080 0x190 tmp/i386-linux.elf-fold.o
0x0000000000c011e2 mmap
0x0000000000c011ba Pprotect
.text 0x0000000000c01210 0x5d1 tmp/i386-linux.elf-main.o
0x0000000000c01338 get_page_mask
0x0000000000c016d7 upx_main
*(.data)
*fill* 0x0000000000c017ed 0x3 00
.data 0x0000000000c017f0 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c017f0 0x0 tmp/i386-linux.elf-main.o
*fill* 0x0000000000c017e1 0x3 00
.data 0x0000000000c017e4 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c017e4 0x0 tmp/i386-linux.elf-main.o
.data
.bss 0x0000000000c017f0 0x0
.bss 0x0000000000c017f0 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c017f0 0x0 tmp/i386-linux.elf-main.o
.bss 0x0000000000c017e4 0x0
.bss 0x0000000000c017e4 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c017e4 0x0 tmp/i386-linux.elf-main.o
.rel.dyn 0x0000000000c017f0 0x0
.rel.dyn 0x0000000000c017e4 0x0
.rel.text 0x0000000000000000 0x0 tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-main.o