Skip to content

Commit f7155b7

Browse files
committed
Merge 'aslr' into HEAD
Address Space Layout Randomization (ASLR) allows executables' memory layout to change at random between runs, and therefore offers a quite decent protection against many attacks. We enable ASLR because MSYS2's C compiler offers support for ASLR, and whatever performance impact it has is neglible, according to https://insights.sei.cmu.edu/cert/2014/02/differences-between-aslr-on-windows-and-linux.html This merges the part of #612 that does not break Git ;-) This fixes #608 Signed-off-by: Johannes Schindelin <[email protected]>
2 parents fb0b9d9 + 9a2aebc commit f7155b7

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

config.mak.uname

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,13 +573,21 @@ else
573573
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
574574
# MSys2
575575
prefix = /usr/
576+
# Enable DEP
577+
BASIC_LDFLAGS += -Wl,--nxcompat
578+
# Enable ASLR (unless debugging)
579+
ifneq (,$(findstring -O,$(CFLAGS)))
580+
BASIC_LDFLAGS += -Wl,--dynamicbase
581+
endif
576582
ifeq (MINGW32,$(MSYSTEM))
577583
prefix = /mingw32
578584
HOST_CPU = i686
585+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
579586
endif
580587
ifeq (MINGW64,$(MSYSTEM))
581588
prefix = /mingw64
582589
HOST_CPU = x86_64
590+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
583591
else
584592
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
585593
BASIC_LDFLAGS += -Wl,--large-address-aware

0 commit comments

Comments
 (0)