summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorNayna Jain <nayna@linux.ibm.com>2019-06-07 15:12:06 -0400
committerMimi Zohar <zohar@linux.ibm.com>2019-06-14 08:53:58 -0400
commit9e1e5d4372d641d3cd6d6cb8dc0b488a7850d222 (patch)
treea922fb0106d3a68d4166373dde7c860a388f5516 /security
parent68f2529078f97dd4dc7f01bc4d495cf5f5814363 (diff)
downloadblackbird-op-linux-9e1e5d4372d641d3cd6d6cb8dc0b488a7850d222.tar.gz
blackbird-op-linux-9e1e5d4372d641d3cd6d6cb8dc0b488a7850d222.zip
x86/ima: fix the Kconfig dependency for IMA_ARCH_POLICY
If enabled, ima arch specific policies always adds the measurements rules, this makes it dependent on CONFIG_IMA. CONFIG_IMA_APPRAISE implicitly takes care of this, however it is needed explicitly for CONFIG_KEXEC_VERIFY_SIG. This patch adds the CONFIG_IMA dependency in combination with CONFIG_KEXEC_VERIFY_SIG for CONFIG_IMA_ARCH_POLICY Fixes: d958083a8f640 (x86/ima: define arch_get_ima_policy() for x86) Signed-off-by: Nayna Jain <nayna@linux.ibm.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index a18f8c6d13b5..df65d2d41905 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -159,7 +159,8 @@ config IMA_APPRAISE
config IMA_ARCH_POLICY
bool "Enable loading an IMA architecture specific policy"
- depends on KEXEC_VERIFY_SIG || IMA_APPRAISE && INTEGRITY_ASYMMETRIC_KEYS
+ depends on (KEXEC_VERIFY_SIG && IMA) || IMA_APPRAISE \
+ && INTEGRITY_ASYMMETRIC_KEYS
default n
help
This option enables loading an IMA architecture specific policy
OpenPOWER on IntegriCloud