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

Mach-o for 'rust' has intermixed LC_SEGMENT64 "__DWARF" with 0==.vmsize

Browse Source 
https://github.com/upx/upx/issues/222
	modified:   p_mach.cpp
	modified:   stub/src/amd64-darwin.macho-main.c
	modified:   stub/src/amd64-darwin.macho-upxmain.c
	also *-darwin.macho-fold.{h,map}
This commit is contained in:
John Reiser
2018-10-13 21:06:37 -07:00
parent f88b85e126
commit 473b90419f
9 changed files with 411 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/tmp/amd64-darwin.macho-fold.map
+33 -33
View File
@@ -72,7 +72,7 @@ LOAD tmp/amd64-darwin.macho-main.o
.plt
*(.plt)
.text 0x0000000008048000 0x863
.text 0x0000000008048000 0x88b
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x1d0 tmp/amd64-darwin.macho-fold.o
0x00000000080480b8 munmap
@@ -86,17 +86,17 @@ LOAD tmp/amd64-darwin.macho-main.o
0x00000000080480c4 open
0x00000000080480b4 mprotect
0x00000000080480c0 close
.text 0x00000000080481d0 0x693 tmp/amd64-darwin.macho-main.o
.text 0x00000000080481d0 0x6bb tmp/amd64-darwin.macho-main.o
0x000000000804834c do_xmap
0x00000000080486ce upx_main
0x00000000080486f6 upx_main
*(.text.*personality*)
*(.gnu.warning)
.fini
*(.fini)
0x0000000008048863 PROVIDE (__etext, .)
0x0000000008048863 PROVIDE (_etext, .)
0x0000000008048863 PROVIDE (etext, .)
0x000000000804888b PROVIDE (__etext, .)
0x000000000804888b PROVIDE (_etext, .)
0x000000000804888b PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -112,8 +112,8 @@ LOAD tmp/amd64-darwin.macho-main.o
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
0x0000000008048863 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x0000000008049863 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
0x000000000804888b . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x000000000804988b . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
.eh_frame
*(.eh_frame)
@@ -128,22 +128,22 @@ LOAD tmp/amd64-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__preinit_array_start, .)
.preinit_array 0x000000000804988b 0x0
0x000000000804988b PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x0000000008049863 PROVIDE (__preinit_array_end, .)
0x000000000804988b PROVIDE (__preinit_array_end, .)
.init_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__init_array_start, .)
.init_array 0x000000000804988b 0x0
0x000000000804988b PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x0000000008049863 PROVIDE (__init_array_end, .)
0x000000000804988b PROVIDE (__init_array_end, .)
.fini_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__fini_array_start, .)
.fini_array 0x000000000804988b 0x0
0x000000000804988b PROVIDE (__fini_array_start, .)
*(.fini_array)
*(SORT(.fini_array.*))
0x0000000008049863 PROVIDE (__fini_array_end, .)
0x000000000804988b PROVIDE (__fini_array_end, .)
.ctors
*crtbegin*.o(.ctors)
@@ -169,35 +169,35 @@ LOAD tmp/amd64-darwin.macho-main.o
.got
*(.got)
0x0000000008049863 . = (. DATA_SEGMENT_RELRO_END 0xc)
0x000000000804988b . = (. DATA_SEGMENT_RELRO_END 0xc)
.got.plt
*(.got.plt)
.data 0x0000000008049864 0x0
.data 0x000000000804988c 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000008049864 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x0000000008049864 0x0 tmp/amd64-darwin.macho-main.o
.data 0x000000000804988c 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x000000000804988c 0x0 tmp/amd64-darwin.macho-main.o
*(.gnu.linkonce.d.*personality*)
.data1
*(.data1)
0x0000000008049864 _edata = .
0x0000000008049864 PROVIDE (edata, .)
0x0000000008049864 __bss_start = .
0x000000000804988c _edata = .
0x000000000804988c PROVIDE (edata, .)
0x000000000804988c __bss_start = .
.bss 0x0000000008049864 0x0
.bss 0x000000000804988c 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x0000000008049864 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x0000000008049864 0x0 tmp/amd64-darwin.macho-main.o
.bss 0x000000000804988c 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x000000000804988c 0x0 tmp/amd64-darwin.macho-main.o
*(COMMON)
0x0000000008049864 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049864 . = ALIGN (0x4)
0x0000000008049864 . = ALIGN (0x4)
0x0000000008049864 _end = .
0x0000000008049864 PROVIDE (end, .)
0x0000000008049864 . = DATA_SEGMENT_END (.)
0x000000000804988c . = ALIGN ((. != 0x0)?0x4:0x1)
0x000000000804988c . = ALIGN (0x4)
0x000000000804988c . = ALIGN (0x4)
0x000000000804988c _end = .
0x000000000804988c PROVIDE (end, .)
0x000000000804988c . = DATA_SEGMENT_END (.)
.stab
*(.stab)
src/stub/tmp/arm.v5a-darwin.macho-fold.map
+33 -33
View File
@@ -72,7 +72,7 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.plt
*(.plt)
.text 0x0000000008048000 0x978
.text 0x0000000008048000 0x9b8
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x22c tmp/arm.v5a-darwin.macho-fold.o
0x0000000008048128 munmap
@@ -90,17 +90,17 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
0x00000000080481d0 div10
0x000000000804813c mprotect
0x0000000008048100 close
.text 0x000000000804822c 0x74c tmp/arm.v5a-darwin.macho-main.o
.text 0x000000000804822c 0x78c tmp/arm.v5a-darwin.macho-main.o
0x00000000080483e4 do_xmap
0x00000000080487c0 upx_main
0x0000000008048800 upx_main
*(.text.*personality*)
*(.gnu.warning)
.fini
*(.fini)
0x0000000008048978 PROVIDE (__etext, .)
0x0000000008048978 PROVIDE (_etext, .)
0x0000000008048978 PROVIDE (etext, .)
0x00000000080489b8 PROVIDE (__etext, .)
0x00000000080489b8 PROVIDE (_etext, .)
0x00000000080489b8 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -116,8 +116,8 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
0x0000000008048978 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x0000000008049978 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
0x00000000080489b8 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x00000000080499b8 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
.eh_frame
*(.eh_frame)
@@ -132,22 +132,22 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__preinit_array_start, .)
.preinit_array 0x00000000080499b8 0x0
0x00000000080499b8 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x0000000008049978 PROVIDE (__preinit_array_end, .)
0x00000000080499b8 PROVIDE (__preinit_array_end, .)
.init_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__init_array_start, .)
.init_array 0x00000000080499b8 0x0
0x00000000080499b8 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x0000000008049978 PROVIDE (__init_array_end, .)
0x00000000080499b8 PROVIDE (__init_array_end, .)
.fini_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__fini_array_start, .)
.fini_array 0x00000000080499b8 0x0
0x00000000080499b8 PROVIDE (__fini_array_start, .)
*(.fini_array)
*(SORT(.fini_array.*))
0x0000000008049978 PROVIDE (__fini_array_end, .)
0x00000000080499b8 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin*.o(.ctors)
@@ -173,35 +173,35 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.got
*(.got)
0x0000000008049978 . = (. DATA_SEGMENT_RELRO_END 0xc)
0x00000000080499b8 . = (. DATA_SEGMENT_RELRO_END 0xc)
.got.plt
*(.got.plt)
.data 0x0000000008049978 0x0
.data 0x00000000080499b8 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-fold.o
.data 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-main.o
.data 0x00000000080499b8 0x0 tmp/arm.v5a-darwin.macho-fold.o
.data 0x00000000080499b8 0x0 tmp/arm.v5a-darwin.macho-main.o
*(.gnu.linkonce.d.*personality*)
.data1
*(.data1)
0x0000000008049978 _edata = .
0x0000000008049978 PROVIDE (edata, .)
0x0000000008049978 __bss_start = .
0x00000000080499b8 _edata = .
0x00000000080499b8 PROVIDE (edata, .)
0x00000000080499b8 __bss_start = .
.bss 0x0000000008049978 0x0
.bss 0x00000000080499b8 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-fold.o
.bss 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-main.o
.bss 0x00000000080499b8 0x0 tmp/arm.v5a-darwin.macho-fold.o
.bss 0x00000000080499b8 0x0 tmp/arm.v5a-darwin.macho-main.o
*(COMMON)
0x0000000008049978 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049978 . = ALIGN (0x4)
0x0000000008049978 . = ALIGN (0x4)
0x0000000008049978 _end = .
0x0000000008049978 PROVIDE (end, .)
0x0000000008049978 . = DATA_SEGMENT_END (.)
0x00000000080499b8 . = ALIGN ((. != 0x0)?0x4:0x1)
0x00000000080499b8 . = ALIGN (0x4)
0x00000000080499b8 . = ALIGN (0x4)
0x00000000080499b8 _end = .
0x00000000080499b8 PROVIDE (end, .)
0x00000000080499b8 . = DATA_SEGMENT_END (.)
.stab
*(.stab)
src/stub/tmp/arm64-darwin.macho-fold.map
+44 -44
View File
@@ -67,7 +67,7 @@ LOAD tmp/arm64-darwin.macho-main.o
*(.iplt)
.iplt 0x0000000000400080 0x0 tmp/arm64-darwin.macho-fold.o
.text 0x0000000000400078 0x89c
.text 0x0000000000400078 0x8d8
*(.text.unlikely .text.*_unlikely .text.unlikely.*)
*(.text.exit .text.exit.*)
*(.text.startup .text.startup.*)
@@ -87,16 +87,16 @@ LOAD tmp/arm64-darwin.macho-main.o
0x000000000040018c mmap
0x0000000000400198 pread
0x00000000004001a4 bswap
.text 0x00000000004001d0 0x744 tmp/arm64-darwin.macho-main.o
.text 0x00000000004001d0 0x780 tmp/arm64-darwin.macho-main.o
0x000000000040037c do_xmap
0x0000000000400738 upx_main
0x0000000000400774 upx_main
*(.gnu.warning)
.fini
*(SORT(.fini))
0x0000000000400914 PROVIDE (__etext, .)
0x0000000000400914 PROVIDE (_etext, .)
0x0000000000400914 PROVIDE (etext, .)
0x0000000000400950 PROVIDE (__etext, .)
0x0000000000400950 PROVIDE (_etext, .)
0x0000000000400950 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -107,9 +107,9 @@ LOAD tmp/arm64-darwin.macho-main.o
.eh_frame_hdr
*(.eh_frame_hdr)
.eh_frame 0x0000000000400918 0x108
.eh_frame 0x0000000000400950 0x110
*(.eh_frame)
.eh_frame 0x0000000000400918 0x108 tmp/arm64-darwin.macho-main.o
.eh_frame 0x0000000000400950 0x110 tmp/arm64-darwin.macho-main.o
0x100 (size before relaxing)
.gcc_except_table
@@ -117,8 +117,8 @@ LOAD tmp/arm64-darwin.macho-main.o
.exception_ranges
*(.exception_ranges .exception_ranges*)
0x0000000000400a20 . = (ALIGN (0x10000) - ((0x10000 - .) & 0xffff))
0x0000000000410a20 . = DATA_SEGMENT_ALIGN (0x10000, 0x1000)
0x0000000000400a60 . = (ALIGN (0x10000) - ((0x10000 - .) & 0xffff))
0x0000000000410a60 . = DATA_SEGMENT_ALIGN (0x10000, 0x1000)
.eh_frame
*(.eh_frame)
@@ -136,22 +136,22 @@ LOAD tmp/arm64-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000000410a20 0x0
0x0000000000410a20 PROVIDE (__preinit_array_start, .)
.preinit_array 0x0000000000410a60 0x0
0x0000000000410a60 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x0000000000410a20 PROVIDE (__preinit_array_end, .)
0x0000000000410a60 PROVIDE (__preinit_array_end, .)
.init_array 0x0000000000410a20 0x0
0x0000000000410a20 PROVIDE (__init_array_start, .)
.init_array 0x0000000000410a60 0x0
0x0000000000410a60 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x0000000000410a20 PROVIDE (__init_array_end, .)
0x0000000000410a60 PROVIDE (__init_array_end, .)
.fini_array 0x0000000000410a20 0x0
0x0000000000410a20 PROVIDE (__fini_array_start, .)
.fini_array 0x0000000000410a60 0x0
0x0000000000410a60 PROVIDE (__fini_array_start, .)
*(SORT(.fini_array.*))
*(.fini_array)
0x0000000000410a20 PROVIDE (__fini_array_end, .)
0x0000000000410a60 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin.o(.ctors)
@@ -180,43 +180,43 @@ LOAD tmp/arm64-darwin.macho-main.o
.got
*(.got)
*(.igot)
0x0000000000410a20 . = DATA_SEGMENT_RELRO_END (., 0x18)
0x0000000000410a60 . = DATA_SEGMENT_RELRO_END (., 0x18)
.got.plt 0x0000000000410a20 0x0
.got.plt 0x0000000000410a60 0x0
*(.got.plt)
*(.igot.plt)
.igot.plt 0x0000000000410a20 0x0 tmp/arm64-darwin.macho-fold.o
.igot.plt 0x0000000000410a60 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x0000000000410a20 0x0
0x0000000000410a20 PROVIDE (__data_start, .)
.data 0x0000000000410a60 0x0
0x0000000000410a60 PROVIDE (__data_start, .)
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000000410a20 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x0000000000410a20 0x0 tmp/arm64-darwin.macho-main.o
.data 0x0000000000410a60 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x0000000000410a60 0x0 tmp/arm64-darwin.macho-main.o
.data1
*(.data1)
0x0000000000410a20 _edata = .
0x0000000000410a20 PROVIDE (edata, .)
0x0000000000410a20 . = .
0x0000000000410a20 __bss_start = .
0x0000000000410a20 __bss_start__ = .
0x0000000000410a60 _edata = .
0x0000000000410a60 PROVIDE (edata, .)
0x0000000000410a60 . = .
0x0000000000410a60 __bss_start = .
0x0000000000410a60 __bss_start__ = .
.bss 0x0000000000410a20 0x0
.bss 0x0000000000410a60 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x0000000000410a20 0x0 tmp/arm64-darwin.macho-fold.o
.bss 0x0000000000410a20 0x0 tmp/arm64-darwin.macho-main.o
.bss 0x0000000000410a60 0x0 tmp/arm64-darwin.macho-fold.o
.bss 0x0000000000410a60 0x0 tmp/arm64-darwin.macho-main.o
*(COMMON)
0x0000000000410a20 . = ALIGN ((. != 0x0)?0x8:0x1)
0x0000000000410a20 _bss_end__ = .
0x0000000000410a20 __bss_end__ = .
0x0000000000410a20 . = ALIGN (0x8)
0x0000000000410a20 . = SEGMENT_START ("ldata-segment", .)
0x0000000000410a20 . = ALIGN (0x8)
0x0000000000410a20 __end__ = .
0x0000000000410a20 _end = .
0x0000000000410a20 PROVIDE (end, .)
0x0000000000410a20 . = DATA_SEGMENT_END (.)
0x0000000000410a60 . = ALIGN ((. != 0x0)?0x8:0x1)
0x0000000000410a60 _bss_end__ = .
0x0000000000410a60 __bss_end__ = .
0x0000000000410a60 . = ALIGN (0x8)
0x0000000000410a60 . = SEGMENT_START ("ldata-segment", .)
0x0000000000410a60 . = ALIGN (0x8)
0x0000000000410a60 __end__ = .
0x0000000000410a60 _end = .
0x0000000000410a60 PROVIDE (end, .)
0x0000000000410a60 . = DATA_SEGMENT_END (.)
.stab
*(.stab)