Module Name: src
Committed By: martin
Date: Tue May 24 13:57:26 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Update comment explaining why PAX_MPROTECT is disabled here
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 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.185 src/sys/arch/sparc64/conf/GENERIC:1.186
--- src/sys/arch/sparc64/conf/GENERIC:1.185 Thu May 19 15:37:06 2016
+++ src/sys/arch/sparc64/conf/GENERIC Tue May 24 13:57:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.185 2016/05/19 15:37:06 christos Exp $
+# $NetBSD: GENERIC,v 1.186 2016/05/24 13:57:26 martin 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.185 $"
+#ident "GENERIC-$Revision: 1.186 $"
maxusers 64
@@ -1008,7 +1008,8 @@ pseudo-device drvctl
options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
-# XXX: MPROTECT is broken!
+# XXX: there is no PLT format for sparc64 that cooperates with
+# MPROTECT, so disable it for now
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
