- merged from LINUX_2_6

[packages/kernel.git] / kernel-pax.config

diff --git a/kernel-pax.config b/kernel-pax.config
index 1464b3e050b872e3559654bd52c0da64de7cf0e9..c90a1d8ce5d7c05fdbbb35d0ac971c7f1aa9d951 100644 (file)
--- a/kernel-pax.config
+++ b/kernel-pax.config
@@ -1,13 +1,11 @@
 #
 # PaX
-#  
+#
 CONFIG_PAX=y
-# CONFIG_PAX_MEMORY_SANITIZE is not set
-# CONFIG_PAX_MEMORY_UDEREF is not set
 
 #
 # PaX Control
-#      
+#
 CONFIG_PAX_SOFTMODE=y
 # CONFIG_PAX_EI_PAX is not set
 CONFIG_PAX_PT_PAX_FLAGS=y
@@ -17,22 +15,30 @@ CONFIG_PAX_HAVE_ACL_FLAGS=y
 
 #
 # Non-executable pages
-#      
+#
 CONFIG_PAX_NOEXEC=y
 CONFIG_PAX_PAGEEXEC=y
-CONFIG_PAX_SEGMEXEC=y
-# CONFIG_PAX_DEFAULT_PAGEEXEC is not set
-CONFIG_PAX_DEFAULT_SEGMEXEC=y
-CONFIG_PAX_EMUTRAMP=y
+# CONFIG_PAX_SEGMEXEC is not set
+# CONFIG_PAX_EMUTRAMP is not set
+# CONFIG_PAX_EMUSIGRT is not set
 CONFIG_PAX_MPROTECT=y
+CONFIG_PAX_ETEXECRELOCS=y
+# CONFIG_PAX_EMUPLT is not set
 # CONFIG_PAX_NOELFRELOCS is not set
 
 #
 # Address Space Layout Randomization
-#      
+#
 CONFIG_PAX_ASLR=y
 # CONFIG_PAX_RANDKSTACK is not set
 CONFIG_PAX_RANDUSTACK=y
 CONFIG_PAX_RANDMMAP=y
-CONFIG_PAX_NOVSYSCALL=y
 
+#
+# Miscellaneous hardening features
+#
+# CONFIG_PAX_MEMORY_SANITIZE is not set
+# CONFIG_PAX_REFCOUNT is not set
+CONFIG_PAX_MEMORY_UDEREF=y
+
+CONFIG_PAX_KERNEXEC=y