ima: cleanup ima_init_policy() a little

commit 5577857f8e26e9027271f10daf96361640907300 upstream.

It's a bit easier to read this if we split it up into two for loops.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index b17f26fa727a4b5270ba02fccbde5dd7b93ad337..e4244fc43cf10caf62618cebe5bf5e4c65c65b08 100644 (file)
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -340,16 +340,12 @@ void __init ima_init_policy(void)
        appraise_entries = ima_use_appraise_tcb ?
                         ARRAY_SIZE(default_appraise_rules) : 0;
 
-       for (i = 0; i < measure_entries + appraise_entries; i++) {
-               if (i < measure_entries)
-                       list_add_tail(&default_rules[i].list,
-                                     &ima_default_rules);
-               else {
-                       int j = i - measure_entries;
-
-                       list_add_tail(&default_appraise_rules[j].list,
-                                     &ima_default_rules);
-               }
+       for (i = 0; i < measure_entries; i++)
+               list_add_tail(&default_rules[i].list, &ima_default_rules);
+
+       for (i = 0; i < appraise_entries; i++) {
+               list_add_tail(&default_appraise_rules[i].list,
+                             &ima_default_rules);
        }
 
        ima_rules = &ima_default_rules;