summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-01-30 11:04:12 +0000
committerJames Morris <james.l.morris@oracle.com>2015-02-02 13:19:48 +1100
commit11cd64a234d5a1a7111627ef947beb0e5fad9e71 (patch)
treef4fc7da084e48eef34d9dbea456a92fbb96c8c70 /security
parentbfc8419670bb6edc53b7423900a50f3c974839a0 (diff)
downloadlinux-stable-11cd64a234d5a1a7111627ef947beb0e5fad9e71.tar.gz
linux-stable-11cd64a234d5a1a7111627ef947beb0e5fad9e71.tar.bz2
linux-stable-11cd64a234d5a1a7111627ef947beb0e5fad9e71.zip
ima: /proc/keys is now mandatory
/proc/keys is now mandatory and its config option no longer exists, so it doesn't need selecting. Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 57515bc915c0..df303346029b 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -126,7 +126,6 @@ config IMA_TRUSTED_KEYRING
bool "Require all keys on the .ima keyring be signed"
depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING
depends on INTEGRITY_ASYMMETRIC_KEYS
- select KEYS_DEBUG_PROC_KEYS
default y
help
This option requires that all keys added to the .ima