Skip to content

Commit 836926e

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 f0ef8a9 + 3525f9e commit 836926e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

config.mak.uname

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,11 +544,17 @@ else
544544
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
545545
# MSys2
546546
prefix = /usr/
547+
# Enable DEP
548+
BASIC_LDFLAGS += -Wl,--nxcompat
549+
# Enable ASLR
550+
BASIC_LDFLAGS += -Wl,--dynamicbase
547551
ifeq (MINGW32,$(MSYSTEM))
548552
prefix = /mingw32
553+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
549554
endif
550555
ifeq (MINGW64,$(MSYSTEM))
551556
prefix = /mingw64
557+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
552558
else
553559
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
554560
BASIC_LDFLAGS += -Wl,--large-address-aware

0 commit comments

Comments
 (0)