Module Name: src
Committed By: christos
Date: Wed Mar 16 16:13:16 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Add PAX_SEGVGUARD disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.425 -r1.426 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.425 src/sys/arch/amd64/conf/GENERIC:1.426
--- src/sys/arch/amd64/conf/GENERIC:1.425 Sat Mar 5 12:08:49 2016
+++ src/sys/arch/amd64/conf/GENERIC Wed Mar 16 12:13:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.425 2016/03/05 17:08:49 riastradh Exp $
+# $NetBSD: GENERIC,v 1.426 2016/03/16 16:13:16 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.425 $"
+#ident "GENERIC-$Revision: 1.426 $"
maxusers 64 # estimated number of users
@@ -1312,5 +1312,6 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
+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
