redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ima: Set again build_ima_appraise variable 

After adding the new add_rule() function in commit c52657d93b
("ima: refactor ima_init_policy()"), all appraisal flags are added to the
temp_ima_appraise variable. Revert to the previous behavior instead of
removing build_ima_appraise, to benefit from the protection offered by
__ro_after_init.

The mentioned commit introduced a bug, as it makes all the flags
modifiable, while build_ima_appraise flags can be protected with
__ro_after_init.

Cc: stable@vger.kernel.org # 5.0.x
Fixes: c52657d93b ("ima: refactor ima_init_policy()")
Co-developed-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Krzysztof Struczynski <krzysztof.struczynski@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
alistair/sunxi64-5.8
Krzysztof Struczynski 2020-04-27 12:28:59 +02:00 committed by Mimi Zohar
parent 6ee28442a4
commit b59fda449c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/integrity/ima/ima_policy.c
View File

@ -643,8 +643,14 @@ static void add_rules(struct ima_rule_entry *entries, int count,
list_add_tail(&entry->list, &ima_policy_rules);
}
if (entries[i].action == APPRAISE)
temp_ima_appraise |= ima_appraise_flag(entries[i].func);
if (entries[i].action == APPRAISE) {
if (entries != build_appraise_rules)
temp_ima_appraise |=
ima_appraise_flag(entries[i].func);
else
build_ima_appraise |=
ima_appraise_flag(entries[i].func);
}
}
}