Skip to contentSkip to conversation

ima: "remove enforce checking duplication" merge fix

PATCH Superseded Mimi Zohar 2 participants 2 messages Feb 24, 2013 – Feb 25, 2013

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Mimi Zohar

author
#0 lore raw

PATCH 1/2 ima: "remove enforce checking duplication" merge fix

Commit "750943a ima: remove enforce checking duplication" combined the 'in IMA policy' and 'enforcing file integrity' checks. For the non-file, kernel module verification, a specific check for 'enforcing file integrity' was not added. This patch adds the check.

---
 security/integrity/ima/ima_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/ima/ima_main.c +2 -1
index 5127afc..5b14a09 100644
@@ -284,7 +284,8 @@ int ima_module_check(struct file *file)
 {
 	if (!file) {
 #ifndef CONFIG_MODULE_SIG_FORCE
-		if (ima_appraise & IMA_APPRAISE_MODULES)
+		if ((ima_appraise & IMA_APPRAISE_MODULES) &&
+		    (ima_appraise & IMA_APPRAISE_ENFORCE))
 			return -EACCES;	/* INTEGRITY_UNKNOWN */
 #endif
 		return 0;	/* We rely on module signature checking */
Signature · 1 line
1.8.1.rc3
maintainer
#1 lore raw
Quoted 6 lines · Mimi Zohar

Commit "750943a ima: remove enforce checking duplication" combined the 'in IMA policy' and 'enforcing file integrity' checks. For the non-file, kernel module verification, a specific check for 'enforcing file integrity' was not added. This patch adds the check.

Where did you post 2/2 ?

Signature · 2 lines
James Morris
<[email protected]>