Skip to content

Commit fbceda7

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 59f6b59 + 4466232 commit fbceda7

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
@@ -548,11 +548,19 @@ else
548548
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
549549
# MSys2
550550
prefix = /usr/
551+
# Enable DEP
552+
BASIC_LDFLAGS += -Wl,--nxcompat
553+
# Enable ASLR (unless debugging)
554+
ifneq (,$(findstring -O,$(CFLAGS)))
555+
BASIC_LDFLAGS += -Wl,--dynamicbase
556+
endif
551557
ifeq (MINGW32,$(MSYSTEM))
552558
prefix = /mingw32
559+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
553560
endif
554561
ifeq (MINGW64,$(MSYSTEM))
555562
prefix = /mingw64
563+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
556564
else
557565
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
558566
BASIC_LDFLAGS += -Wl,--large-address-aware

0 commit comments

Comments
 (0)