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

Preserve Mach_segment_header.flags; fix non-PIE main programs on MacOS.

Browse Source 
https://github.com/upx/upx/issues/222
	modified:   p_mach.cpp
	modified:   p_mach.h
	modified:   stub/src/amd64-darwin.macho-entry.S
	also *.macho-*.h, *.macho-fold.map, amd64-darwin.macho-entry.bin.dump
This commit is contained in:
John Reiser
2018-09-22 18:45:44 -07:00
parent c1cfde21d7
commit 4d1c754af9
11 changed files with 737 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/tmp/amd64-darwin.macho-fold.map
+35 -36
View File
@@ -72,9 +72,9 @@ LOAD tmp/amd64-darwin.macho-main.o
.plt
*(.plt)
.text 0x0000000008048000 0x7a7
.text 0x0000000008048000 0x863
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x157 tmp/amd64-darwin.macho-fold.o
.text 0x0000000008048000 0x1d0 tmp/amd64-darwin.macho-fold.o
0x00000000080480b8 munmap
0x000000000804809c bswap
0x00000000080480c8 mmap
@@ -86,18 +86,17 @@ LOAD tmp/amd64-darwin.macho-main.o
0x00000000080480c4 open
0x00000000080480b4 mprotect
0x00000000080480c0 close
*fill* 0x0000000008048157 0x1 90909090
.text 0x0000000008048158 0x64f tmp/amd64-darwin.macho-main.o
0x00000000080482d4 do_xmap
0x0000000008048612 upx_main
.text 0x00000000080481d0 0x693 tmp/amd64-darwin.macho-main.o
0x000000000804834c do_xmap
0x00000000080486ce upx_main
*(.text.*personality*)
*(.gnu.warning)
.fini
*(.fini)
0x00000000080487a7 PROVIDE (__etext, .)
0x00000000080487a7 PROVIDE (_etext, .)
0x00000000080487a7 PROVIDE (etext, .)
0x0000000008048863 PROVIDE (__etext, .)
0x0000000008048863 PROVIDE (_etext, .)
0x0000000008048863 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -113,8 +112,8 @@ LOAD tmp/amd64-darwin.macho-main.o
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
0x00000000080487a7 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x00000000080497a7 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
0x0000000008048863 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x0000000008049863 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
.eh_frame
*(.eh_frame)
@@ -129,22 +128,22 @@ LOAD tmp/amd64-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__preinit_array_start, .)
.preinit_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x00000000080497a7 PROVIDE (__preinit_array_end, .)
0x0000000008049863 PROVIDE (__preinit_array_end, .)
.init_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__init_array_start, .)
.init_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x00000000080497a7 PROVIDE (__init_array_end, .)
0x0000000008049863 PROVIDE (__init_array_end, .)
.fini_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__fini_array_start, .)
.fini_array 0x0000000008049863 0x0
0x0000000008049863 PROVIDE (__fini_array_start, .)
*(.fini_array)
*(SORT(.fini_array.*))
0x00000000080497a7 PROVIDE (__fini_array_end, .)
0x0000000008049863 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin*.o(.ctors)
@@ -170,35 +169,35 @@ LOAD tmp/amd64-darwin.macho-main.o
.got
*(.got)
0x00000000080497a7 . = (. DATA_SEGMENT_RELRO_END 0xc)
0x0000000008049863 . = (. DATA_SEGMENT_RELRO_END 0xc)
.got.plt
*(.got.plt)
.data 0x00000000080497a8 0x0
.data 0x0000000008049864 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-main.o
.data 0x0000000008049864 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x0000000008049864 0x0 tmp/amd64-darwin.macho-main.o
*(.gnu.linkonce.d.*personality*)
.data1
*(.data1)
0x00000000080497a8 _edata = .
0x00000000080497a8 PROVIDE (edata, .)
0x00000000080497a8 __bss_start = .
0x0000000008049864 _edata = .
0x0000000008049864 PROVIDE (edata, .)
0x0000000008049864 __bss_start = .
.bss 0x00000000080497a8 0x0
.bss 0x0000000008049864 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-main.o
.bss 0x0000000008049864 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x0000000008049864 0x0 tmp/amd64-darwin.macho-main.o
*(COMMON)
0x00000000080497a8 . = ALIGN ((. != 0x0)?0x4:0x1)
0x00000000080497a8 . = ALIGN (0x4)
0x00000000080497a8 . = ALIGN (0x4)
0x00000000080497a8 _end = .
0x00000000080497a8 PROVIDE (end, .)
0x00000000080497a8 . = DATA_SEGMENT_END (.)
0x0000000008049864 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049864 . = ALIGN (0x4)
0x0000000008049864 . = ALIGN (0x4)
0x0000000008049864 _end = .
0x0000000008049864 PROVIDE (end, .)
0x0000000008049864 . = DATA_SEGMENT_END (.)
.stab
*(.stab)