Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer

[pandora-kernel.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index e0f08b5..b9bc07d 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -38,7 +38,9 @@ config TRUSTED_KEYS
 
 config ENCRYPTED_KEYS
        tristate "ENCRYPTED KEYS"
-       depends on KEYS && TRUSTED_KEYS
+       depends on KEYS
+       select CRYPTO
+       select CRYPTO_HMAC
        select CRYPTO_AES
        select CRYPTO_CBC
        select CRYPTO_SHA256
@@ -94,6 +96,16 @@ config SECURITY
 
          If you are unsure how to answer this question, answer N.
 
+config PAGE_TABLE_ISOLATION
+       bool "Remove the kernel mapping in user mode"
+       default y
+       depends on X86_64 && SMP
+       help
+         This enforces a strict kernel and user space isolation, in order
+         to close hardware side channels on kernel address information.
+
+         If you are unsure how to answer this question, answer Y.
+
 config SECURITYFS
        bool "Enable the securityfs filesystem"
        help
@@ -186,7 +198,7 @@ source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/apparmor/Kconfig
 
-source security/integrity/ima/Kconfig
+source security/integrity/Kconfig
 
 choice
        prompt "Default security module"