ima: Use the common function to detect LSM conditionals in a rule

Make broader use of ima_rule_contains_lsm_cond() to check if a given
rule contains an LSM conditional. This is a code cleanup and has no
user-facing change.

Signed-off-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index c679144..dcd1aaa 100644 (file)
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -360,17 +360,10 @@ static bool ima_rule_contains_lsm_cond(struct ima_rule_entry *entry)
 static void ima_lsm_update_rules(void)
 {
        struct ima_rule_entry *entry, *e;
-       int i, result, needs_update;
+       int result;
 
        list_for_each_entry_safe(entry, e, &ima_policy_rules, list) {
-               needs_update = 0;
-               for (i = 0; i < MAX_LSM_RULES; i++) {
-                       if (entry->lsm[i].args_p) {
-                               needs_update = 1;
-                               break;
-                       }
-               }
-               if (!needs_update)
+               if (!ima_rule_contains_lsm_cond(entry))
                        continue;
 
                result = ima_lsm_update_rule(entry);