Module Name: src
Committed By: christos
Date: Sun Apr 10 15:28:24 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
- Turn on ASLR by default
- Add PAX_MPROTECT_DEBUG flag
To generate a diff of this commit:
cvs rdiff -u -r1.427 -r1.428 src/sys/arch/amd64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.427 src/sys/arch/amd64/conf/GENERIC:1.428
--- src/sys/arch/amd64/conf/GENERIC:1.427 Sat Mar 19 19:21:02 2016
+++ src/sys/arch/amd64/conf/GENERIC Sun Apr 10 11:28:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.427 2016/03/19 23:21:02 gdt Exp $
+# $NetBSD: GENERIC,v 1.428 2016/04/10 15:28:24 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.427 $"
+#ident "GENERIC-$Revision: 1.428 $"
maxusers 64 # estimated number of users
@@ -1312,6 +1312,9 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
+options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-options PAX_ASLR=0 # PaX Address Space Layout Randomization
+options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+options PAX_ASLR=1 # PaX Address Space Layout Randomization
+options TRAP_SIGDEBUG
