Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-3.10.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index edc7cbdc012a154e16dce9a67908ef04128e7c7a..fb363cd81cf6db10753c69a3726c31143c3823b2 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -115,7 +115,7 @@ config SECURITY_ROOTPLUG
 
 config INTEL_TXT
        bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)"
-       depends on EXPERIMENTAL && X86 && DMAR && ACPI
+       depends on HAVE_INTEL_TXT
        help
          This option enables support for booting the kernel with the
          Trusted Boot (tboot) module. This will utilize
@@ -123,7 +123,7 @@ config INTEL_TXT
          of the kernel. If the system does not support Intel(R) TXT, this
          will have no effect.
 
-         Intel TXT will provide higher assurance of sysem configuration and
+         Intel TXT will provide higher assurance of system configuration and
          initial state as well as data reset protection.  This is used to
          create a robust initial kernel measurement and verification, which
          helps to ensure that kernel security mechanisms are functioning
@@ -132,7 +132,7 @@ config INTEL_TXT
 
          Intel TXT also helps solve real end user concerns about having
          confidence that their hardware is running the VMM or kernel that
-         it was conigured with, especially since they may be responsible for
+         it was configured with, especially since they may be responsible for
          providing such assurances to VMs and services running on it.
 
          See <http://www.intel.com/technology/security/> for more information
@@ -143,6 +143,22 @@ config INTEL_TXT
 
          If you are unsure as to whether this is required, answer N.
 
+config LSM_MMAP_MIN_ADDR
+       int "Low address space for LSM to protect from user allocation"
+       depends on SECURITY && SECURITY_SELINUX
+       default 65536
+       help
+         This is the portion of low virtual memory which should be protected
+         from userspace allocation.  Keeping a user from writing to low pages
+         can help reduce the impact of kernel NULL pointer bugs.
+
+         For most ia64, ppc64 and x86 users with lots of address space
+         a value of 65536 is reasonable and should cause no problems.
+         On arm and other archs it should not be higher than 32768.
+         Programs which use vm86 functionality or have some need to map
+         this low address space will need the permission specific to the
+         systems running LSM.
+
 source security/selinux/Kconfig
 source security/smack/Kconfig
 source security/tomoyo/Kconfig