Module Name: src
Committed By: christos
Date: Thu May 19 15:37:06 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Turn on ASLR for sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/sparc64/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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.184 src/sys/arch/sparc64/conf/GENERIC:1.185
--- src/sys/arch/sparc64/conf/GENERIC:1.184 Sat Mar 19 19:21:03 2016
+++ src/sys/arch/sparc64/conf/GENERIC Thu May 19 11:37:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.184 2016/03/19 23:21:03 gdt Exp $
+# $NetBSD: GENERIC,v 1.185 2016/05/19 15:37:06 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.184 $"
+#ident "GENERIC-$Revision: 1.185 $"
maxusers 64
@@ -1006,5 +1006,9 @@ pseudo-device nsmb # experimental - S
# drvctl - needed to show device dictionary via drvctl(8)
pseudo-device drvctl
-#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
- # (for static binaries only for now)
+options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
+# XXX: MPROTECT is broken!
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+options PAX_ASLR=1 # PaX Address Space Layout Randomization
