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

Cleanup after broken tools

Browse Source 
zig/powerpc64le/musl newly undefined openat64; adjacent literal strings
in C source were not concatenated; comment introduced by double slash
did not ignore backslash in rest of line
	modified:   ../misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
	modified:   stub/src/mipsel.r3000-linux.elf-fold.S
	modified:   stub/src/powerpc-linux.elf-entry.S
	modified:   stub/src/powerpc-linux.elf-fold.S
	modified:   stub/src/powerpc64-linux.elf-entry.S
	modified:   stub/src/powerpc64-linux.elf-fold.S
	modified:   stub/src/upxfd_linux.c
This commit is contained in:
John Reiser 2025-03-21 13:25:02 -07:00
parent ff9d577e46
commit 071579b5b6
13 changed files with 3103 additions and 3064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
misc/testsuite/upx_testsuite_1-expected_sha256sums.sh generated
View File

@ -64,9 +64,9 @@ a7bd9f616231d883f6700b09e3c9a0af2880c6b5e5b0ce1cd8f06de43c48856c *m68k-atari.tos
9b42b732c31f13cfdaca4a8d50377531a6b935a7090e26279e6ca4f9a4422a73 *mips-linux.elf/upx-3.95
625b1298459be6ce5ceada2555688a402a00971e76c1060e93a08f5a127e238d *mipsel-linux.elf/upx-3.91
40392ccbb86615d75e9c4770a9d267e9f113264c5700cca86b58e93c263aa512 *mipsel-linux.elf/upx-3.95
5a1602e2d0b115a69ce3eb21de084775abd86efd9db200671c5fb9bf2aefd25a *powerpc-linux.elf/upx-3.91
c28e0ecda22c18dce79f82c11b9c31ab3c13d8c5a0eb7be436f8fae2ab62a641 *powerpc-linux.elf/upx-3.95
23d9068e04717b78bbd7a05137c4ed0a40405a38d53c23ca6f38b82ea1353c1d *powerpc64le-linux.elf/upx-3.95
431237d1540f7efaf22d6a3fff6ec63468c7b4b68d546c95fd22f25584a27bb5 *powerpc-linux.elf/upx-3.91
4e54db7f048c23ff7c0dc09a89f0e29894dc3c223b628f9f9b363f8ed95f4535 *powerpc-linux.elf/upx-3.95
bf4f53b147efd9834c8b8fac1ec7308999a6ab58090da0ab7488c4f27d817a79 *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
434f886426eaa94b4217ecf051816c58f77bb4886ef2b007cb3e07419ecdba77 *amd64-linux.elf/upx-3.91
@ -87,9 +87,9 @@ d52d36e5631bdda358a330cf22bb8cc31081a13696e96da0b25e93dd4083ba8f *armeb-linux.el
de67025bb876edfb453518a36f81f134bfb4cffe40139f9ac1a0da24fc62b9e9 *mips-linux.elf/upx-3.95
b70c68646f58629b4e05be220ef28e41c1d4d20569080adbb66f37878eb5c81a *mipsel-linux.elf/upx-3.91
5a3ea49da3195f4944efee444534c3ecd768b57d701f356246597450843b2dab *mipsel-linux.elf/upx-3.95
7a75cd6a0cdfb2499f8593495b404027ae02164e410c983ab65ea3189f238ce0 *powerpc-linux.elf/upx-3.91
0bec7c1443b88c9afe4f6cdabb0782ee54160a2c4ade85ae299b28ab6136d0be *powerpc-linux.elf/upx-3.95
28b070f1116093e75601423fd595b2aa0349b23706ccec109622006f45192fdc *powerpc64le-linux.elf/upx-3.95
e427b40a4eeb27bbbe09f35fa004079b8e6928347ab455e9475f186da817a712 *powerpc-linux.elf/upx-3.91
f22e0df3795eda729ad2053dc0e7b99ad194897b31fbbf13cf88c2e9566186be *powerpc-linux.elf/upx-3.95
36914503182423bafa260a749ae8ee42a20ce907aa096e0c56ddcba07333451f *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
2bba827f754519fd5d353e96e9f108783fb17f4b739deab0bf1d8696e125601f *amd64-linux.elf/upx-3.91
@ -110,9 +110,9 @@ c78db15a8113b806e56812fd842fb467d2a9c9557fcdc0467dae3f4c33316630 *i386-win32.pe/
61426bf0e5d6b14381d9f806dd822289eb036f7fcaef9f5409c243a2c2b236a7 *mips-linux.elf/upx-3.95
26eaac0cb342f71e9600b9689700d5ea3edf19a459c322316e50d56e48531e43 *mipsel-linux.elf/upx-3.91
9784ccf82483a2072b264d2600afde97fe33f5b9ed3cb207402b17c3d8e3b992 *mipsel-linux.elf/upx-3.95
954a02cf918a353f01791530ace2c74989e16cd85b8001d6a13f149222619fa6 *powerpc-linux.elf/upx-3.91
0c10bb15e20929c2cf7422c9cf0afdff946e2f68a91c7f4002ff68f2866f4c0e *powerpc-linux.elf/upx-3.95
857bd1b25172fb84fb1f90ae90753ae9feb075774f29e9ba90b548136f13c952 *powerpc64le-linux.elf/upx-3.95
f9b7f4bf02435f224bd2cbe9c66cb05f6aa9de98faf5c4cbfa5078b7ea889ab6 *powerpc-linux.elf/upx-3.91
f9855c0a0842bbe2485790b1c8384a42bf7f296332a7006dd6ffc56a5e9463b6 *powerpc-linux.elf/upx-3.95
978c6c4b282a2ac0a003b90426ba6a5a2660a746e9333bcaad57db688dba087c *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t140_compress_lzma_2_no_filter="\
38a137eb0ee9026574249f39f45723e43796a699712725ca4b28fc14823f0c58 *amd64-linux.elf/upx-3.91
@ -133,9 +133,9 @@ e268c98fdacfd04268d76644f2bb4746ae04b57801407aaa1867798840eeeea0 *m68k-atari.tos
c3917e223054c7782df5291d8a48d8d1646eb5c604b1b1702bc53a0815586d1b *mips-linux.elf/upx-3.95
59fec7d5a4e96b70e9847ebf2ee6f62b84192e75b117a0f5c476ea419b00cc6d *mipsel-linux.elf/upx-3.91
af03d5bd5000dee9d8b63530c2cfa034b7842688f90ce6c507a7eda7a0bab46f *mipsel-linux.elf/upx-3.95
626d9af1c7f8fc96d2a46269913d7bca83febce7fbaa1a569eee9d4c5ceb9e47 *powerpc-linux.elf/upx-3.91
edb3b40d9af74918cb8ddb1dec33310c91e99aeb487c286cfe8cbfa90363620b *powerpc-linux.elf/upx-3.95
02e54408212a5dee6467eac5fb128177e0a4aefb0917161a91d5a0b8a9210961 *powerpc64le-linux.elf/upx-3.95
5e8da6f2cee1a2db00852a18c0cd256f4b1a41a9cb4094390be2bf6ad9a8a008 *powerpc-linux.elf/upx-3.91
14e5c8f38353ef98141db9fa00e4ded0c4a38eb825a256182dfc6de70fc10907 *powerpc-linux.elf/upx-3.95
f09d79da9fdd7007fb65514a1bc113ba8da585c159d3c0569094d96b913f73f0 *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t150_compress_ucl_2_all_filters="\
f8da0ed7032f451bd7fff1f679467c0e50c934aa17cba0acfc3c1ee84b4490c0 *amd64-linux.elf/upx-3.91
@ -156,9 +156,9 @@ e414ad0aba43790d0498b26c23055fb051129b6cbe3e070a1406c91ac5b8032b *m68k-atari.tos
edd54138dcc4773c53f8b008b68e8d65842250e9725bd697132a9357c9d82dfb *mips-linux.elf/upx-3.95
fd8e59a9d7b95345478a4fc735064cae829c0dda7c36a8b446d49238749e1023 *mipsel-linux.elf/upx-3.91
54a62d8481473765242e84466fc5e71165fba55ddd444b8de3187f6fcfae2e0f *mipsel-linux.elf/upx-3.95
e0de0712b98001dca0bcc0e7b108b1b9b7fb58ccfa750109173b86a39ebdf7c4 *powerpc-linux.elf/upx-3.91
f886d9e6897597bfeb9aa8ae7364607fe1399a728c128f28d60ac6d44c4b2ff3 *powerpc-linux.elf/upx-3.95
a1c7527677d33fd7c8cae88db3388ef8d9c9f6136f73815babf659d98c91532c *powerpc64le-linux.elf/upx-3.95
308cc1128f63d496d8568282cf8a0acf73a231119f834ec91f6a06de6fff940d *powerpc-linux.elf/upx-3.91
3e498201f3094023b4c6c88f9e7646eea972c2c98a260af2af1dfa8486ae9014 *powerpc-linux.elf/upx-3.95
144d39ce4be29fc228681c05d30761c2106e7f681ee7e52f8d06e1aa786de28b *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t160_compress_all_methods_1_no_filter="\
a7929980362584e393c951bcd19228cf562a6fe3acc7ee6c1b93e69a34e5244c *amd64-linux.elf/upx-3.91
@ -179,9 +179,9 @@ f3d33c5c9809943a902133490bcf0cfbe39a5ef1635a0c29b3bdc4f35dfffa50 *i386-win32.pe/
b17f53e2f65e3aa4f65f4a13c3188a6742d647188689b5566347b43b4014f9ce *mips-linux.elf/upx-3.95
587a4669e58b3440b9febb5837db4cca2213eb132be0a6c99ce478761ef2f991 *mipsel-linux.elf/upx-3.91
1a8555e21f2d93f743ad38a051e9b4ecddbba7e8e27730356df37e23c4bdd2eb *mipsel-linux.elf/upx-3.95
7320861ed059b70b2c40d3379c0ab96e39f3d9dc1ec44b98d48a7472054d71b4 *powerpc-linux.elf/upx-3.91
74355a684ab0fe0bb3caee1002f2e62c8d7e520b5b23c5fbd9fbe63d9e759378 *powerpc-linux.elf/upx-3.95
a93f5a5b48c3f9e99179a8750a7729b3bce30787b302ac07e5fcb412526d76c0 *powerpc64le-linux.elf/upx-3.95
4ab414f33161a1189a611169a45af5ac19ce7e8726d4545bf33898fbe094072e *powerpc-linux.elf/upx-3.91
3385a8fec9de7259f10dd28f4f2b3d1ef239c637e89067def70f51fde5b95743 *powerpc-linux.elf/upx-3.95
d4cf39dfa8d29151346319d7a2daf44bea133b7195657496566b0a750e9e4170 *powerpc64le-linux.elf/upx-3.95
"
expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
c1a7d0187d4b96c39d9d99ec1c7488f60977e23782ec78daa200b89525ffcb2c *amd64-linux.elf/upx-3.91
@ -202,8 +202,8 @@ ad47c7522167f6f7e47d495e1fa119431386ca5ea9bc16b6a4b9cb38cf9cd29f *i386-win32.pe/
d951f1770d80473b332dff30694226b1d8dcc1c8e248846607f32c6bb2ae0793 *mips-linux.elf/upx-3.95
bfa8b6b2eae848d63c177b66542834f4e7d9fc3d03360974ca003fe9f1ebd6d6 *mipsel-linux.elf/upx-3.91
dac9f7b04460d56065779bd6bbf14296eb143eb473781c6cad3247f6a8768b8a *mipsel-linux.elf/upx-3.95
df5d62020942be8c6235f9a4c5a7904041ca6a3e281587d92a2ecfbaaf47c7fa *powerpc-linux.elf/upx-3.91
1d3dfb0ff501b30dff351f22dc770db04bb5686d4949edc089d2f776156128a5 *powerpc-linux.elf/upx-3.95
893bd39e0592ad03300869c58431d11b2c9094a4597c09d4925aa1ac9283982d *powerpc64le-linux.elf/upx-3.95
034c559d769702da21a9c60d0b94c0137273f8d1a04f05a4e0315a36c47c44eb *powerpc-linux.elf/upx-3.91
dcc08f02cc303380e36f9115bb344248699a5651399a67c4d9a74bbedc8ff390 *powerpc-linux.elf/upx-3.95
d627e51a4f0aa926b1c2af19f0a2ba9cbd4ef682a132e3f23f4cec33c7809825 *powerpc64le-linux.elf/upx-3.95
"
########## end .sha256sums.recreate

1836
src/stub/powerpc-linux.elf-fold.h generated
View File

File diff suppressed because it is too large Load Diff

2106
src/stub/powerpc64-linux.elf-fold.h generated
View File

File diff suppressed because it is too large Load Diff

2110
src/stub/powerpc64le-linux.elf-fold.h generated
View File

File diff suppressed because it is too large Load Diff

8
src/stub/src/mipsel.r3000-linux.elf-fold.S
View File

@ -31,9 +31,11 @@ NBPW= 4
#include "arch/mips/r3000/macros.ash"
#include "arch/mips/r3000/bits.ash"
// eglibc-2.11.1/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
// #define __SYSCALL_CLOBBERS "$1", "$3", "$10", "$11", "$12", "$13", \
// "$14", "$15", "$24", "$25", "hi", "lo", "memory"
/*
eglibc-2.11.1/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
#define __SYSCALL_CLOBBERS "$1", "$3", "$10", "$11", "$12", "$13", \
"$14", "$15", "$24", "$25", "hi", "lo", "memory"
*/
.set mips1
.set noreorder

1
src/stub/src/powerpc-linux.elf-entry.S
View File

@ -71,6 +71,7 @@ __NR_mprotect = 125
__NR_munmap = 91
__NR_open = 5
__NR_write = 4
__NR_openat = 286
EINVAL= 22

3
src/stub/src/powerpc-linux.elf-fold.S
View File

@ -290,6 +290,7 @@ SYS_munmap= 91
SYS_ftruncate= 93
SYS_mprotect= 125
SYS_msync= 144
SYS_openat= 286
SYS_memfd_create= 360
exit: .globl exit
@ -308,6 +309,8 @@ read: .globl read
li r0,SYS_read; 5: b 5f
open: .globl open
li r0,SYS_open; 5: b 5f
openat: .globl openat
li r0,SYS_openat; 5: b 5f
mprotect: .globl mprotect
li 0,SYS_mprotect; 5: b 5f
msync: .globl msync

1
src/stub/src/powerpc64-linux.elf-entry.S
View File

@ -70,6 +70,7 @@ __NR_munmap = 91
__NR_close = 6
__NR_open = 5
__NR_write = 4
__NR_openat = 286
EINVAL= 22

4
src/stub/src/powerpc64-linux.elf-fold.S
View File

@ -357,6 +357,7 @@ SYS_munmap= 91
SYS_ftruncate= 93
SYS_mprotect= 125
SYS_msync= 144
SYS_openat= 286
SYS_memfd_create= 360
mmap: .globl mmap
@ -389,6 +390,9 @@ read: .globl read
li r0,SYS_read; 5: b 5f
open: .globl open
li r0,SYS_open; 5: b 5f
openat64: .globl openat64 // alias of openat because this is 64-bit already
openat: .globl openat
li r0,SYS_openat; 5: b 5f
close: .globl close
li r0,SYS_close; 5: b sysgo

3
src/stub/src/upxfd_linux.c
View File

@ -141,8 +141,7 @@ unsigned long upx_mmap_and_fd_linux( // returns (mapped_addr | (1+ fd))
if (fd < 0) {
if (-EISDIR == fd) { // no memfd_create often lacks O_TMPFILE, too
write(2, addr_string(
"UPX-5.0 wants memfd_create(), "
"or needs /dev/shm(,O_TMPFILE,)\n"), 61);
"UPX-5.0 wants memfd_create(), or needs /dev/shm(,O_TMPFILE,)\\n"), 61);
exit(127);
}
// Error from open() is unknown. Cause later SIGSEGV.

21
src/stub/tmp/powerpc-linux.elf-fold.map generated vendored
View File

@ -50,23 +50,24 @@ LOAD tmp/powerpc-expand.o
LOAD tmp/powerpc-linux.elf-main2.o
OUTPUT(tmp/powerpc-linux.elf-fold.bin elf32-powerpc)
SYSCALLS 0x0000000000000000 0xf8
SYSCALLS 0x0000000000000000 0xf8 tmp/powerpc-linux.elf-fold.o
0x0000000000000050 munmap
0x00000000000000b0 memcpy
SYSCALLS 0x0000000000000000 0x100
SYSCALLS 0x0000000000000000 0x100 tmp/powerpc-linux.elf-fold.o
0x0000000000000058 munmap
0x00000000000000b8 memcpy
0x0000000000000010 readlink
0x0000000000000018 ftruncate
0x0000000000000058 mmap
0x0000000000000060 mmap
0x0000000000000028 write
0x000000000000006c memfd_create
0x0000000000000074 memfd_create
0x0000000000000030 read
0x00000000000000d4 memset
0x0000000000000048 msync
0x00000000000000f0 my_bkpt
0x00000000000000dc memset
0x0000000000000050 msync
0x00000000000000f8 my_bkpt
0x0000000000000000 exit
0x0000000000000008 brk
0x0000000000000040 openat
0x0000000000000038 open
0x0000000000000040 mprotect
0x0000000000000048 mprotect
0x0000000000000020 close
EXP_HEAD 0x0000000000000000 0xa8

16
src/stub/tmp/powerpc64-linux.elf-fold.map generated vendored
View File

@ -27,8 +27,8 @@ OUTPUT(tmp/powerpc64-linux.elf-fold.bin elf64-powerpc)
.bss 0x0000000000000000 0x0
.bss 0x0000000000000000 0x0 tmp/powerpc64-linux.elf-fold.o
SYSCALLS 0x0000000000000000 0x140
SYSCALLS 0x0000000000000000 0x140 tmp/powerpc64-linux.elf-fold.o
SYSCALLS 0x0000000000000000 0x148
SYSCALLS 0x0000000000000000 0x148 tmp/powerpc64-linux.elf-fold.o
0x0000000000000008 mmap
0x0000000000000020 munmap
0x0000000000000028 mprotect
@ -40,11 +40,13 @@ SYSCALLS 0x0000000000000000 0x140
0x0000000000000058 write
0x0000000000000060 read
0x0000000000000068 open
0x0000000000000070 close
0x0000000000000078 upxfd_create
0x00000000000000d0 memfd_create
0x0000000000000114 memcpy
0x0000000000000138 my_bkpt
0x0000000000000070 openat64
0x0000000000000070 openat
0x0000000000000078 close
0x0000000000000080 upxfd_create
0x00000000000000d8 memfd_create
0x000000000000011c memcpy
0x0000000000000140 my_bkpt
.comment 0x0000000000000000 0x33
.comment 0x0000000000000000 0x33 tmp/powerpc64-linux.elf-fold.o

16
src/stub/tmp/powerpc64le-linux.elf-fold.map generated vendored
View File

@ -27,8 +27,8 @@ OUTPUT(tmp/powerpc64le-linux.elf-fold.bin elf64-powerpcle)
.bss 0x0000000000000000 0x0
.bss 0x0000000000000000 0x0 tmp/powerpc64le-linux.elf-fold.o
SYSCALLS 0x0000000000000000 0x140
SYSCALLS 0x0000000000000000 0x140 tmp/powerpc64le-linux.elf-fold.o
SYSCALLS 0x0000000000000000 0x148
SYSCALLS 0x0000000000000000 0x148 tmp/powerpc64le-linux.elf-fold.o
0x0000000000000008 mmap
0x0000000000000020 munmap
0x0000000000000028 mprotect
@ -40,11 +40,13 @@ SYSCALLS 0x0000000000000000 0x140
0x0000000000000058 write
0x0000000000000060 read
0x0000000000000068 open
0x0000000000000070 close
0x0000000000000078 upxfd_create
0x00000000000000d0 memfd_create
0x0000000000000114 memcpy
0x0000000000000138 my_bkpt
0x0000000000000070 openat64
0x0000000000000070 openat
0x0000000000000078 close
0x0000000000000080 upxfd_create
0x00000000000000d8 memfd_create
0x000000000000011c memcpy
0x0000000000000140 my_bkpt
.comment 0x0000000000000000 0x33
.comment 0x0000000000000000 0x33 tmp/powerpc64le-linux.elf-fold.o