From: Nayna Jain Date: Fri, 7 Jun 2019 19:12:06 +0000 (-0400) Subject: x86/ima: fix the Kconfig dependency for IMA_ARCH_POLICY X-Git-Tag: v5.4-rc1~661^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e1e5d4372d641d3cd6d6cb8dc0b488a7850d222;p=platform%2Fkernel%2Flinux-rpi.git 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 Cc: Eric Biederman Cc: Dave Young Signed-off-by: Mimi Zohar --- diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index a18f8c6..df65d2d 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