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

arm32, arm64 ABI for -static must preserve register 0

Browse Source 
Also arm32 forgot to unmap the expanded de-compressor via the escape hatch.

https://github.com/upx/upx/issues/758
https://github.com/upx/upx/issues/768
	modified:   ../misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
	modified:   stub/src/arm.v4a-linux.elf-entry.S
	modified:   stub/src/arm.v4a-linux.elf-fold.S
	modified:   stub/src/arm64-linux.elf-entry.S
	modified:   stub/src/arm64-linux.elf-fold.S
	modified:   stub/src/i386-linux.elf-main.c
	modified:   stub/src/amd64-linux.elf-main.c
          plus associated *.h *.map *.dump
This commit is contained in:
John Reiser
2024-01-12 15:39:18 -08:00
committed by Markus F.X.J. Oberhumer
parent 2ad0d51226
commit 38ed4b2017
23 changed files with 4257 additions and 4248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/tmp/arm.v4a-linux.elf-entry.bin.dump
Generated Vendored
+13 -13
View File
@@ -2,18 +2,18 @@ file format elf32-littlearm
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0c 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 040 2**0 CONTENTS
2 NRV_TAIL 0 0 0 040 2**0 CONTENTS
3 NRV2E 012c 0 0 040 2**0 CONTENTS
4 NRV2D 0118 0 0 016c 2**0 CONTENTS
5 NRV2B 0dc 0 0 0284 2**0 CONTENTS
6 LZMA_ELF00 0ac 0 0 0360 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 040c 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0d44 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 011bc 2**0 CONTENTS
10 ELFMAINY 0 0 0 011bc 2**0 CONTENTS
11 ELFMAINZ 0d0 0 0 011bc 2**2 CONTENTS
0 ELFMAINX 010 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 044 2**0 CONTENTS
2 NRV_TAIL 0 0 0 044 2**0 CONTENTS
3 NRV2E 012c 0 0 044 2**0 CONTENTS
4 NRV2D 0118 0 0 0170 2**0 CONTENTS
5 NRV2B 0dc 0 0 0288 2**0 CONTENTS
6 LZMA_ELF00 0ac 0 0 0364 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 0410 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0d48 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 011c0 2**0 CONTENTS
10 ELFMAINY 0 0 0 011c0 2**0 CONTENTS
11 ELFMAINZ 0d0 0 0 011c0 2**2 CONTENTS
SYMBOL TABLE:
00000000 l d NRV2E 0 NRV2E
00000000 l d NRV2D 0 NRV2D
@@ -40,7 +40,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR [ELFMAINX]:
OFFSET TYPE VALUE
00000000 R_ARM_ABS32 MFLG
00000008 R_ARM_PC24 ELFMAINZ
0000000c R_ARM_PC24 ELFMAINZ
RELOCATION RECORDS FOR [NRV2E]:
OFFSET TYPE VALUE
src/stub/tmp/arm.v4a-linux.elf-fold.map
Generated Vendored
+26 -26
View File
@@ -8,34 +8,34 @@ Linker script and memory map
0x0000000000008040 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008040 0xab0
.text 0x0000000000008040 0xaac
*(.text)
.text 0x0000000000008040 0x340 tmp/arm.v4a-linux.elf-fold.o
0x0000000000008258 my_bkpt
0x0000000000008260 exit
0x0000000000008264 read
0x000000000000826c write
0x0000000000008274 open
0x000000000000827c close
0x0000000000008284 unlink
0x000000000000828c getpid
0x0000000000008294 brk
0x000000000000829c readlink
0x00000000000082a4 munmap
0x00000000000082ac Pprotect
0x00000000000082ac mprotect
0x00000000000082c4 mmap
0x00000000000082f8 __clear_cache
0x0000000000008304 get_sys_munmap
0x000000000000830c mmap_privanon
0x0000000000008324 __udivsi3
0x0000000000008324 div10
.text 0x0000000000008380 0x770 tmp/arm.v4a-linux.elf-main.o
0x00000000000083a0 get_page_mask
0x00000000000089bc upx_main
.text 0x0000000000008040 0x348 tmp/arm.v4a-linux.elf-fold.o
0x0000000000008260 my_bkpt
0x0000000000008268 exit
0x000000000000826c read
0x0000000000008274 write
0x000000000000827c open
0x0000000000008284 close
0x000000000000828c unlink
0x0000000000008294 getpid
0x000000000000829c brk
0x00000000000082a4 readlink
0x00000000000082ac munmap
0x00000000000082b4 Pprotect
0x00000000000082b4 mprotect
0x00000000000082cc mmap
0x0000000000008300 __clear_cache
0x000000000000830c get_sys_munmap
0x0000000000008314 mmap_privanon
0x000000000000832c __udivsi3
0x000000000000832c div10
.text 0x0000000000008388 0x764 tmp/arm.v4a-linux.elf-main.o
0x00000000000083a8 get_page_mask
0x00000000000089b8 upx_main
*(.data)
.data 0x0000000000008af0 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008af0 0x0 tmp/arm.v4a-linux.elf-main.o
.data 0x0000000000008aec 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008aec 0x0 tmp/arm.v4a-linux.elf-main.o
.data
LOAD tmp/arm.v4a-linux.elf-fold.o
src/stub/tmp/arm.v5a-linux.elf-entry.bin.dump
Generated Vendored
+13 -13
View File
@@ -2,18 +2,18 @@ file format elf32-littlearm
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0c 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 040 2**0 CONTENTS
2 NRV_TAIL 0 0 0 040 2**0 CONTENTS
3 NRV2E 0144 0 0 040 2**0 CONTENTS
4 NRV2D 0130 0 0 0184 2**0 CONTENTS
5 NRV2B 0f4 0 0 02b4 2**0 CONTENTS
6 LZMA_ELF00 0c4 0 0 03a8 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 046c 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0da4 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 0121c 2**0 CONTENTS
10 ELFMAINY 0 0 0 0121c 2**0 CONTENTS
11 ELFMAINZ 0dc 0 0 0121c 2**2 CONTENTS
0 ELFMAINX 010 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 044 2**0 CONTENTS
2 NRV_TAIL 0 0 0 044 2**0 CONTENTS
3 NRV2E 0144 0 0 044 2**0 CONTENTS
4 NRV2D 0130 0 0 0188 2**0 CONTENTS
5 NRV2B 0f4 0 0 02b8 2**0 CONTENTS
6 LZMA_ELF00 0c4 0 0 03ac 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 0470 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0da8 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 01220 2**0 CONTENTS
10 ELFMAINY 0 0 0 01220 2**0 CONTENTS
11 ELFMAINZ 0dc 0 0 01220 2**2 CONTENTS
SYMBOL TABLE:
00000000 l d NRV2E 0 NRV2E
00000000 l d NRV2D 0 NRV2D
@@ -40,7 +40,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR [ELFMAINX]:
OFFSET TYPE VALUE
00000000 R_ARM_ABS32 MFLG
00000008 R_ARM_PC24 ELFMAINZ
0000000c R_ARM_PC24 ELFMAINZ
RELOCATION RECORDS FOR [NRV2E]:
OFFSET TYPE VALUE
src/stub/tmp/arm.v5a-linux.elf-fold.map
Generated Vendored
+29 -29
View File
@@ -9,40 +9,40 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xb5c
.text 0x0000000000008080 0xb58
*(.text)
.text 0x0000000000008080 0x3f4 tmp/arm.v5a-linux.elf-fold.o
0x0000000000008350 munmap
0x00000000000083f8 get_sys_munmap
0x0000000000008314 getpid
0x000000000000833c readlink
0x0000000000008418 __udivsi3
0x0000000000008388 mmap
0x00000000000083d4 __clear_cache
0x0000000000008400 mmap_privanon
0x00000000000082c4 write
0x00000000000082b0 read
0x0000000000008300 unlink
0x0000000000008298 my_bkpt
0x0000000000008364 Pprotect
0x00000000000082a0 exit
0x0000000000008328 brk
0x00000000000082d8 open
0x0000000000008418 div10
0x0000000000008364 mprotect
0x00000000000082ec close
.text 0x0000000000008474 0x768 tmp/armel-linux.elf-main.o
0x0000000000008494 get_page_mask
0x0000000000008aa8 upx_main
.text 0x0000000000008080 0x3fc tmp/arm.v5a-linux.elf-fold.o
0x0000000000008358 munmap
0x0000000000008400 get_sys_munmap
0x000000000000831c getpid
0x0000000000008344 readlink
0x0000000000008420 __udivsi3
0x0000000000008390 mmap
0x00000000000083dc __clear_cache
0x0000000000008408 mmap_privanon
0x00000000000082cc write
0x00000000000082b8 read
0x0000000000008308 unlink
0x00000000000082a0 my_bkpt
0x000000000000836c Pprotect
0x00000000000082a8 exit
0x0000000000008330 brk
0x00000000000082e0 open
0x0000000000008420 div10
0x000000000000836c mprotect
0x00000000000082f4 close
.text 0x000000000000847c 0x75c tmp/armel-linux.elf-main.o
0x000000000000849c get_page_mask
0x0000000000008aa4 upx_main
*(.data)
.data 0x0000000000008bdc 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008bdc 0x0 tmp/armel-linux.elf-main.o
.data 0x0000000000008bd8 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008bd8 0x0 tmp/armel-linux.elf-main.o
.data
.bss 0x0000000000008bdc 0x0
.bss 0x0000000000008bdc 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008bdc 0x0 tmp/armel-linux.elf-main.o
.bss 0x0000000000008bd8 0x0
.bss 0x0000000000008bd8 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008bd8 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)
src/stub/tmp/arm64-linux.elf-entry.bin.dump
Generated Vendored
+13 -13
View File
@@ -2,18 +2,18 @@ file format elf64-littleaarch64
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0c 0 0 040 2**0 CONTENTS
1 NRV_HEAD 0 0 0 04c 2**0 CONTENTS
2 NRV_TAIL 0 0 0 04c 2**0 CONTENTS
3 NRV2E 017c 0 0 04c 2**0 CONTENTS
4 NRV2D 0170 0 0 01c8 2**0 CONTENTS
5 NRV2B 0144 0 0 0338 2**0 CONTENTS
6 LZMA_ELF00 010c 0 0 047c 2**0 CONTENTS
7 LZMA_DEC20 0968 0 0 0588 2**0 CONTENTS
8 LZMA_DEC10 04a0 0 0 0ef0 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 01390 2**0 CONTENTS
10 ELFMAINY 03e 0 0 01390 2**0 CONTENTS
11 ELFMAINZ 0fc 0 0 013d0 2**2 CONTENTS
0 ELFMAINX 010 0 0 040 2**0 CONTENTS
1 NRV_HEAD 0 0 0 050 2**0 CONTENTS
2 NRV_TAIL 0 0 0 050 2**0 CONTENTS
3 NRV2E 017c 0 0 050 2**0 CONTENTS
4 NRV2D 0170 0 0 01cc 2**0 CONTENTS
5 NRV2B 0144 0 0 033c 2**0 CONTENTS
6 LZMA_ELF00 010c 0 0 0480 2**0 CONTENTS
7 LZMA_DEC20 0968 0 0 058c 2**0 CONTENTS
8 LZMA_DEC10 04a0 0 0 0ef4 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 01394 2**0 CONTENTS
10 ELFMAINY 03e 0 0 01394 2**0 CONTENTS
11 ELFMAINZ 0fc 0 0 013d4 2**2 CONTENTS
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0 LZMA_DEC30
0000000000000000 l d ELFMAINZ 0 ELFMAINZ
@@ -39,7 +39,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR [ELFMAINX]:
OFFSET TYPE VALUE
0000000000000000 R_AARCH64_ABS32 MFLG
0000000000000008 R_AARCH64_CALL26 ELFMAINZ+0x00000000000000b0
000000000000000c R_AARCH64_CALL26 ELFMAINZ+0x00000000000000b0
RELOCATION RECORDS FOR [LZMA_ELF00]:
OFFSET TYPE VALUE
src/stub/tmp/arm64-linux.elf-fold.map
Generated Vendored
+27 -27
View File
@@ -8,46 +8,46 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xa68
.text 0x00000000001000bc 0xa78
*(.text)
.text 0x00000000001000bc 0x2b0 tmp/arm64-linux.elf-fold.o
.text 0x00000000001000bc 0x2c0 tmp/arm64-linux.elf-fold.o
0x00000000001000c4 get_page_mask
0x00000000001000d4 mmap_privanon
0x00000000001000e4 mmap
0x0000000000100100 Pprotect
0x0000000000100100 mprotect
0x00000000001002c8 my_bkpt
0x00000000001002d0 exit
0x00000000001002d8 read
0x00000000001002e4 write
0x00000000001002f0 close
0x00000000001002fc getpid
0x0000000000100308 brk
0x0000000000100314 munmap
0x0000000000100320 unlink
0x0000000000100334 readlink
0x000000000010033c open
0x0000000000100358 __clear_cache
.text 0x000000000010036c 0x7b8 tmp/arm64-linux.elf-main.o
0x00000000001009bc upx_main
0x00000000001002d8 my_bkpt
0x00000000001002e0 exit
0x00000000001002e8 read
0x00000000001002f4 write
0x0000000000100300 close
0x000000000010030c getpid
0x0000000000100318 brk
0x0000000000100324 munmap
0x0000000000100330 unlink
0x0000000000100344 readlink
0x000000000010034c open
0x0000000000100368 __clear_cache
.text 0x000000000010037c 0x7b8 tmp/arm64-linux.elf-main.o
0x00000000001009cc upx_main
*(.data)
.data 0x0000000000100b24 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100b24 0x0 tmp/arm64-linux.elf-main.o
.data 0x0000000000100b34 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100b34 0x0 tmp/arm64-linux.elf-main.o
.iplt 0x0000000000100b24 0x0
.iplt 0x0000000000100b24 0x0 tmp/arm64-linux.elf-fold.o
.iplt 0x0000000000100b34 0x0
.iplt 0x0000000000100b34 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100b28 0x0
.rela.iplt 0x0000000000100b28 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100b38 0x0
.rela.iplt 0x0000000000100b38 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 0x0000000000100b28 0x0
.igot.plt 0x0000000000100b28 0x0 tmp/arm64-linux.elf-fold.o
.igot.plt 0x0000000000100b38 0x0
.igot.plt 0x0000000000100b38 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100b24 0x0
.bss 0x0000000000100b24 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100b24 0x0 tmp/arm64-linux.elf-main.o
.bss 0x0000000000100b34 0x0
.bss 0x0000000000100b34 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100b34 0x0 tmp/arm64-linux.elf-main.o
src/stub/tmp/armeb.v4a-linux.elf-entry.bin.dump
Generated Vendored
+13 -13
View File
@@ -2,18 +2,18 @@ file format elf32-bigarm
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0c 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 040 2**0 CONTENTS
2 NRV_TAIL 0 0 0 040 2**0 CONTENTS
3 NRV2E 012c 0 0 040 2**0 CONTENTS
4 NRV2D 0118 0 0 016c 2**0 CONTENTS
5 NRV2B 0dc 0 0 0284 2**0 CONTENTS
6 LZMA_ELF00 0ac 0 0 0360 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 040c 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0d44 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 011bc 2**0 CONTENTS
10 ELFMAINY 0 0 0 011bc 2**0 CONTENTS
11 ELFMAINZ 0d0 0 0 011bc 2**2 CONTENTS
0 ELFMAINX 010 0 0 034 2**0 CONTENTS
1 NRV_HEAD 0 0 0 044 2**0 CONTENTS
2 NRV_TAIL 0 0 0 044 2**0 CONTENTS
3 NRV2E 012c 0 0 044 2**0 CONTENTS
4 NRV2D 0118 0 0 0170 2**0 CONTENTS
5 NRV2B 0dc 0 0 0288 2**0 CONTENTS
6 LZMA_ELF00 0ac 0 0 0364 2**0 CONTENTS
7 LZMA_DEC20 0938 0 0 0410 2**0 CONTENTS
8 LZMA_DEC10 0478 0 0 0d48 2**0 CONTENTS
9 LZMA_DEC30 0 0 0 011c0 2**0 CONTENTS
10 ELFMAINY 0 0 0 011c0 2**0 CONTENTS
11 ELFMAINZ 0d0 0 0 011c0 2**2 CONTENTS
SYMBOL TABLE:
00000000 l d NRV2E 0 NRV2E
00000000 l d NRV2D 0 NRV2D
@@ -40,7 +40,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR [ELFMAINX]:
OFFSET TYPE VALUE
00000000 R_ARM_ABS32 MFLG
00000008 R_ARM_PC24 ELFMAINZ
0000000c R_ARM_PC24 ELFMAINZ
RELOCATION RECORDS FOR [NRV2E]:
OFFSET TYPE VALUE
src/stub/tmp/armeb.v4a-linux.elf-fold.map
Generated Vendored
+29 -29
View File
@@ -9,40 +9,40 @@ Linker script and memory map
TARGET(elf32-bigarm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xab0
.text 0x0000000000008080 0xaac
*(.text)
.text 0x0000000000008080 0x340 tmp/armeb.v4a-linux.elf-fold.o
0x00000000000082e4 munmap
0x0000000000008344 get_sys_munmap
0x00000000000082cc getpid
0x00000000000082dc readlink
0x0000000000008364 __udivsi3
0x0000000000008304 mmap
0x0000000000008338 __clear_cache
0x000000000000834c mmap_privanon
0x00000000000082ac write
0x00000000000082a4 read
0x00000000000082c4 unlink
0x0000000000008298 my_bkpt
0x00000000000082ec Pprotect
0x00000000000082a0 exit
0x00000000000082d4 brk
0x00000000000082b4 open
0x0000000000008364 div10
0x00000000000082ec mprotect
0x00000000000082bc close
.text 0x00000000000083c0 0x770 tmp/armeb.v4a-linux.elf-main.o
0x00000000000083e0 get_page_mask
0x00000000000089fc upx_main
.text 0x0000000000008080 0x348 tmp/armeb.v4a-linux.elf-fold.o
0x00000000000082ec munmap
0x000000000000834c get_sys_munmap
0x00000000000082d4 getpid
0x00000000000082e4 readlink
0x000000000000836c __udivsi3
0x000000000000830c mmap
0x0000000000008340 __clear_cache
0x0000000000008354 mmap_privanon
0x00000000000082b4 write
0x00000000000082ac read
0x00000000000082cc unlink
0x00000000000082a0 my_bkpt
0x00000000000082f4 Pprotect
0x00000000000082a8 exit
0x00000000000082dc brk
0x00000000000082bc open
0x000000000000836c div10
0x00000000000082f4 mprotect
0x00000000000082c4 close
.text 0x00000000000083c8 0x764 tmp/armeb.v4a-linux.elf-main.o
0x00000000000083e8 get_page_mask
0x00000000000089f8 upx_main
*(.data)
.data 0x0000000000008b30 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008b30 0x0 tmp/armeb.v4a-linux.elf-main.o
.data 0x0000000000008b2c 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008b2c 0x0 tmp/armeb.v4a-linux.elf-main.o
.data
.bss 0x0000000000008b30 0x0
.bss 0x0000000000008b30 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008b30 0x0 tmp/armeb.v4a-linux.elf-main.o
.bss 0x0000000000008b2c 0x0
.bss 0x0000000000008b2c 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008b2c 0x0 tmp/armeb.v4a-linux.elf-main.o
LOAD tmp/armeb.v4a-linux.elf-fold.o
LOAD tmp/armeb.v4a-linux.elf-main.o
OUTPUT(tmp/armeb.v4a-linux.elf-fold.bin elf32-bigarm)