mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Workaround valgrind-3.24.0 botch of 'notrack' on i386

Browse Source 
https://github.com/upx/upx/issues/890
	modified:   stub/src/i386-linux.elf-fold.S
	modified:   ../misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
           plus generated .h .map
This commit is contained in:
John Reiser 2025-03-02 14:30:50 -08:00
parent 70f1ab8cb7
commit 903ca50391
4 changed files with 1179 additions and 1179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,8 +56,8 @@ e4270e47b2a4051b88189c286a2d5d56eb10a278d9608a5d1cc0d160fca6c695 *amd64-linux.el
a48928a22f71f1acd612f8bd0a469b86724d06639e46790d5e79f2b2cc728f87 *armeb-linux.elf/upx-3.95
a7ee051c5f9dcf233e2ee248274121b99fb8f098eff95469bc0638a7423723f0 *i386-dos32.djgpp2.coff/upx-3.91.exe
85cf31be166cb59587a99419cdd0fc5a79825d7508ab2c9a4bc0d700d603354d *i386-dos32.djgpp2.coff/upx-3.95.exe
19dc41b0e3c2254e3502c887d4b081d805b06f6edfe5c73068b16639811b63fd *i386-linux.elf/upx-3.91
ac94b1938c277e3de1433fb33c0cd549d48342c193b183e981099b145328499b *i386-linux.elf/upx-3.95
caed1ea1e598d11249f7d91db5041c94854bb63f931da34faebe9e7f06bc8e9e *i386-linux.elf/upx-3.91
b188a4cf5b88fff7087db684936a3f269c13e37e6478e0c7b6bb1e73095b5ddf *i386-linux.elf/upx-3.95
934dd17076c0298d35a738533ea668e1fcbf8fc85c6671fcdd3a12e7722502ce *i386-win32.pe/upx-3.91.exe
519a9f6b3de56f5f080151074b9d5d81e31c1961cd6e395f73d2d522b7f7f8e0 *i386-win32.pe/upx-3.95.exe
a7bd9f616231d883f6700b09e3c9a0af2880c6b5e5b0ce1cd8f06de43c48856c *m68k-atari.tos/upx-3.91.ttp
@ -79,8 +79,8 @@ d58ba72377a494b8274784341eca1d1d044802e9d8b4603ec6d8159915091873 *armeb-linux.el
d85fb7eb9c79573a5d37fe35a2dbe988d242364835eaf0d67ddf7ef601d395ed *armeb-linux.elf/upx-3.95
51e4faea51e12c7442b27bb50150f532ac51d8102f77a669cbce82f2675a2ef2 *i386-dos32.djgpp2.coff/upx-3.91.exe
1196f578ab0b862bae8ac6b5166b770f072cf0ac521a2a23a6347c19ea82a0da *i386-dos32.djgpp2.coff/upx-3.95.exe
cd1b03791e0b1b848b18a26e74ff339ee2757275f7a3ac7ca2aba21b03f9766e *i386-linux.elf/upx-3.91
b68652b1ab70e052723ed9e05b360a54a2a2dc748813e28470828c17fb7efe33 *i386-linux.elf/upx-3.95
fbcdf5ce2c0ae2c67d0cd08d1be2c133ee692ff3353859a437496530963330f1 *i386-linux.elf/upx-3.91
1dc8bdff47a7652f1bd0b67ac4986699d3e5ca57ee82fe515fd2c57a2d9761bd *i386-linux.elf/upx-3.95
3edf364443a3cd56efd04e95cc7d7c1846bf76addedd7263cfe8330771f19509 *i386-win32.pe/upx-3.91.exe
48141fd66443f85ea867d7fa0bb3a50debb10f15bdb26c71888026e17c88d3a8 *i386-win32.pe/upx-3.95.exe
07e1c09a953a9c87afa33d1236f46244280161bf3802273a523d380318886177 *m68k-atari.tos/upx-3.91.ttp
@ -102,8 +102,8 @@ ad0a7a18e87657d28260b7c527d284863becd3c5f92259c570125465f88d4042 *arm-wince.pe/u
b4cf235a0c43ffcedf07a6dabf71b885713c131c93799d068b13f7126a37afaf *armeb-linux.elf/upx-3.95
6fcdc8e34ce8b3501db2260c8a921c6e963954fdeffedfefca353a27bcc02d56 *i386-dos32.djgpp2.coff/upx-3.91.exe
6f4f901c1838252f9b3104060475a6f13a2ebec830096ff28d870148580e4287 *i386-dos32.djgpp2.coff/upx-3.95.exe
aeda3375c276dd092a56cf7210d53128169a568a13a6c85aee1d972ce3a7744f *i386-linux.elf/upx-3.91
42781bc5ccb1e47bc7c0fe533d5429559b4915cf752bb98b1ed1faaefc2c1a5b *i386-linux.elf/upx-3.95
982053071d4665fae51b7860c56161cf21038fc4e1fed9fcde7d49cee84e4364 *i386-linux.elf/upx-3.91
95bb69010e544ca80cd296102fea2767c92dcf0a7c2b7746799a0e96221246af *i386-linux.elf/upx-3.95
c78db15a8113b806e56812fd842fb467d2a9c9557fcdc0467dae3f4c33316630 *i386-win32.pe/upx-3.91.exe
89314e8621c4a00e1a65e045686245d3c1e2ba0a858f1dcc8f3cc2d0eedccfb5 *i386-win32.pe/upx-3.95.exe
710ad88b63cc7e0fa0b413ebdbcebf41140678f551b5dd883ed6220507be3601 *m68k-atari.tos/upx-3.91.ttp
@ -125,8 +125,8 @@ be799f57dc1401956561b6e2c0bbe3e3cf20f878f84ee4a58bdddcfb3479d2f9 *arm-linux.elf/
fcf11333cd639030ef57d3768b7774e2109229c81705696afa93bcc1edf5f65d *armeb-linux.elf/upx-3.95
7a8eaa5139b95cc56591200fce62d3c9af163671467952cab6fcf487318107bb *i386-dos32.djgpp2.coff/upx-3.91.exe
9b5fc0f54a5f811bda190c36fb2fa5c5b03c6c3de0c62693e4191230b5a419b8 *i386-dos32.djgpp2.coff/upx-3.95.exe
d35b65234a67cc8445956154fe754ee25bbad50ec56e7fcf475becdb75d81e9c *i386-linux.elf/upx-3.91
fef93d7764e25424442477d790d9558a1b2dae35ce25675828a006f08e1d8068 *i386-linux.elf/upx-3.95
2b42b27136d168eb52f6e0d7aca949ed8f2c81b8b109e3e26a40860d8ef1c1bb *i386-linux.elf/upx-3.91
8294f45280ba75eeb694bdc6c3e72e378f723def40f8040db053ba86da225cb0 *i386-linux.elf/upx-3.95
0e0780f5fccc52f6c78414f7279263b26e31de7c6ca1ec65a240e37cf0a4f5c9 *i386-win32.pe/upx-3.91.exe
3ddd6265d69e374f5f0f8c9f602e0e59c895da2f3fef611ef89f0ee4ae2c592b *i386-win32.pe/upx-3.95.exe
e268c98fdacfd04268d76644f2bb4746ae04b57801407aaa1867798840eeeea0 *m68k-atari.tos/upx-3.91.ttp
@ -148,8 +148,8 @@ ae557d8dd4e385f25f25585dd36b651f57d3bb004ba70883f445922258af2ca2 *arm64-linux.el
e1f7802433553aa451b3ba733ad8195c7cbec1801da1f4d50bfda9080208ba48 *armeb-linux.elf/upx-3.95
aa05c3a2953f0f2d70842cba45786b707a79ffef22fd084f51e304762cc67765 *i386-dos32.djgpp2.coff/upx-3.91.exe
c677241e9a8753ba1332ac3875ab6398fb2d792d2627edd9e58f2535b3131abe *i386-dos32.djgpp2.coff/upx-3.95.exe
987560b22f94bd472d4452d1394e70b5a8c87269fb47e8535112e8643a732af1 *i386-linux.elf/upx-3.91
3368c33e7840f0651831ac71a706ed51abf4084ce5fde447790edb187f526db4 *i386-linux.elf/upx-3.95
2a20cc3ea1de3604f604dcc46876329a5f12c67af8a3c3ecf41ffb0513cc1c93 *i386-linux.elf/upx-3.91
8b5e9052932572cd1855c4551bc37002607b753c61f296ff39f2669bf146ee73 *i386-linux.elf/upx-3.95
8ec02f816f4727b519e8775edc1afb1df32991319a6c6f050ece416011925379 *i386-win32.pe/upx-3.91.exe
d5aeeedada49c0c2870ea450ed66b2cea31369bccfccf9407378ae0fb0736deb *i386-win32.pe/upx-3.95.exe
e414ad0aba43790d0498b26c23055fb051129b6cbe3e070a1406c91ac5b8032b *m68k-atari.tos/upx-3.91.ttp
@ -171,8 +171,8 @@ d7fd8434d98063e61791fc855aa370857fd0c6231d24252fc1f72c8e0247f811 *armeb-linux.el
44caaa7feb000fccb36de634127a6d7dd16fc426865ee0701ce00c5b5239af86 *armeb-linux.elf/upx-3.95
0a0099246096d20ff6035a4df6566954b9d8aff9ed8fdbd35aa5ee4995b02bfe *i386-dos32.djgpp2.coff/upx-3.91.exe
5df7aa9f0896df87eb8798119ad16a9b89c87a7568a67339e33b5baa99ec361f *i386-dos32.djgpp2.coff/upx-3.95.exe
24fe283b0838efae4ce2c3f881224ddfd2125e2cfa8840606f8065d9e6ee4d7b *i386-linux.elf/upx-3.91
833fc0c23a43b8824fa4bbf13b9c83ce6db0e37ef63173f6a04a75831c4e6f88 *i386-linux.elf/upx-3.95
32e35ad4982d9fbc2f56b7828a3210d201d0fd58c64139c4cb1352870d7a954f *i386-linux.elf/upx-3.91
b13f63cbb82ae1404fe18f9c8005d0b0a5986c555f47ec765d47521f1dd755de *i386-linux.elf/upx-3.95
f3d33c5c9809943a902133490bcf0cfbe39a5ef1635a0c29b3bdc4f35dfffa50 *i386-win32.pe/upx-3.91.exe
474e68a2390cf0376f59402eaef4c902daa49428b628e025b1c8506428a37937 *i386-win32.pe/upx-3.95.exe
1561dd69f67e8705804dba41ebd876bce6a4ce8ed8b0bc0d0e7628697e7fee68 *m68k-atari.tos/upx-3.91.ttp
@ -194,8 +194,8 @@ c7b0d7694fb0c317444edd190d5ca2cc57b22a73e0c5452f7f1f7693dc11d5fb *armeb-linux.el
a3f8a458c2e7ff9bbae1ce240fa097272252e8b3e8041201cc24559fd2c2c409 *armeb-linux.elf/upx-3.95
dda2c348c43741a1bd65049a8e7b51be1ebf873d215370ec002185c85390c168 *i386-dos32.djgpp2.coff/upx-3.91.exe
560392427ded22f2f3fea59ef10e55d65cf841001e67b1e4558ef13514baa602 *i386-dos32.djgpp2.coff/upx-3.95.exe
f1909a9fa141b22e8b7b16b3f765f48bdac0d5e6ee3942aae813053c2c25a7d8 *i386-linux.elf/upx-3.91
54f9bf6d4d474cb1115bc425d9cbfb6de5c9004fc9f7611f57763455210b5c35 *i386-linux.elf/upx-3.95
668b31d2e2b8787b4360e243f36d69c62f02a8c9ac8325c0c3afbe49465e5b7f *i386-linux.elf/upx-3.91
9c1b9d643f96a44c68b9e80c942a2255901522534b1eddd798e53784f3af7fdf *i386-linux.elf/upx-3.95
3510bc5627237752bedd275e73c42bc02cd46145ff916e7bccbdec663f763ee4 *i386-win32.pe/upx-3.91.exe
ad47c7522167f6f7e47d495e1fa119431386ca5ea9bc16b6a4b9cb38cf9cd29f *i386-win32.pe/upx-3.95.exe
1c999e5c6cded8c99a7f6b4595879893ae63d2af1388dc61dd8b4e3106676480 *m68k-atari.tos/upx-3.91.ttp

2312
src/stub/i386-linux.elf-fold.h generated
View File

File diff suppressed because it is too large Load Diff

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

@ -289,7 +289,8 @@ L60:
.byte 0x3e
.endm
mov al, __NR_munmap // eax was 0 from L60
NOTRACK; jmp [edi] // unmap ourselves via escape hatch, then goto entry
// valgrind-3.24.0 has bug with NOTRACK on i386
/*NOTRACK;*/ jmp [edi] // unmap ourselves via escape hatch, then goto entry
section SYSCALLS
// Sometimes linux enforces page-aligned address

15
src/stub/tmp/i386-linux.elf-fold.map generated vendored
View File

@ -7,16 +7,15 @@ Name Origin Length Attributes
Linker script and memory map
.text 0x0000000000000000 0x9b6
.text 0x0000000000000000 0x191 tmp/i386-linux.elf-fold.o
.text 0x0000000000000000 0x9b2
.text 0x0000000000000000 0x190 tmp/i386-linux.elf-fold.o
0x0000000000000008 get_page_mask
0x0000000000000015 get_upxfn_path
*fill* 0x0000000000000191 0x3 00
.text 0x0000000000000194 0x0 tmp/i386-linux.elf-help_umf.o
.text 0x0000000000000194 0x0 tmp/i386-expand.o
.text 0x0000000000000194 0x822 tmp/i386-linux.elf-main2.o
0x00000000000002ec underlay
0x0000000000000862 upx_main
.text 0x0000000000000190 0x0 tmp/i386-linux.elf-help_umf.o
.text 0x0000000000000190 0x0 tmp/i386-expand.o
.text 0x0000000000000190 0x822 tmp/i386-linux.elf-main2.o
0x00000000000002e8 underlay
0x000000000000085e upx_main
HUMF_A 0x0000000000000000 0x5
HUMF_A 0x0000000000000000 0x5 tmp/i386-linux.elf-help_umf.o