diff options
| author | David Howells <dhowells@redhat.com> | 2015-01-30 06:04:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-02-01 21:19:48 -0500 |
| commit | 11cd64a234d5a1a7111627ef947beb0e5fad9e71 (patch) | |
| tree | f4fc7da084e48eef34d9dbea456a92fbb96c8c70 | |
| parent | bfc8419670bb6edc53b7423900a50f3c974839a0 (diff) | |
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>
| -rw-r--r-- | security/integrity/ima/Kconfig | 1 |
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 | |||
| 126 | bool "Require all keys on the .ima keyring be signed" | 126 | bool "Require all keys on the .ima keyring be signed" |
| 127 | depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING | 127 | depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING |
| 128 | depends on INTEGRITY_ASYMMETRIC_KEYS | 128 | depends on INTEGRITY_ASYMMETRIC_KEYS |
| 129 | select KEYS_DEBUG_PROC_KEYS | ||
| 130 | default y | 129 | default y |
| 131 | help | 130 | help |
| 132 | This option requires that all keys added to the .ima | 131 | This option requires that all keys added to the .ima |