Skip to content

Commit 311aa6a

Browse files
bmenegmimizohar
authored andcommitted
ima: move APPRAISE_BOOTPARAM dependency on ARCH_POLICY to runtime
The IMA_APPRAISE_BOOTPARAM config allows enabling different "ima_appraise=" modes - log, fix, enforce - at run time, but not when IMA architecture specific policies are enabled.  This prevents properly labeling the filesystem on systems where secure boot is supported, but not enabled on the platform.  Only when secure boot is actually enabled should these IMA appraise modes be disabled. This patch removes the compile time dependency and makes it a runtime decision, based on the secure boot state of that platform. Test results as follows: -> x86-64 with secure boot enabled [ 0.015637] Kernel command line: <...> ima_policy=appraise_tcb ima_appraise=fix [ 0.015668] ima: Secure boot enabled: ignoring ima_appraise=fix boot parameter option -> powerpc with secure boot disabled [ 0.000000] Kernel command line: <...> ima_policy=appraise_tcb ima_appraise=fix [ 0.000000] Secure boot mode disabled -> Running the system without secure boot and with both options set: CONFIG_IMA_APPRAISE_BOOTPARAM=y CONFIG_IMA_ARCH_POLICY=y Audit prompts "missing-hash" but still allow execution and, consequently, filesystem labeling: type=INTEGRITY_DATA msg=audit(07/09/2020 12:30:27.778:1691) : pid=4976 uid=root auid=root ses=2 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 op=appraise_data cause=missing-hash comm=bash name=/usr/bin/evmctl dev="dm-0" ino=493150 res=no Cc: [email protected] Fixes: d958083 ("x86/ima: define arch_get_ima_policy() for x86") Signed-off-by: Bruno Meneguele <[email protected]> Cc: [email protected] # 5.0 Signed-off-by: Mimi Zohar <[email protected]>
1 parent 1768215 commit 311aa6a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

security/integrity/ima/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ config IMA_APPRAISE_REQUIRE_POLICY_SIGS
232232

233233
config IMA_APPRAISE_BOOTPARAM
234234
bool "ima_appraise boot parameter"
235-
depends on IMA_APPRAISE && !IMA_ARCH_POLICY
235+
depends on IMA_APPRAISE
236236
default y
237237
help
238238
This option enables the different "ima_appraise=" modes

security/integrity/ima/ima_appraise.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
static int __init default_appraise_setup(char *str)
2020
{
2121
#ifdef CONFIG_IMA_APPRAISE_BOOTPARAM
22+
if (arch_ima_get_secureboot()) {
23+
pr_info("Secure boot enabled: ignoring ima_appraise=%s boot parameter option",
24+
str);
25+
return 1;
26+
}
27+
2228
if (strncmp(str, "off", 3) == 0)
2329
ima_appraise = 0;
2430
else if (strncmp(str, "log", 3) == 0)

0 commit comments

Comments
 (0)