diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-04-07 11:22:11 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-05-13 12:07:19 +0200 |
| commit | 5577857f8e26e9027271f10daf96361640907300 (patch) | |
| tree | a42a8ecdea41994cf32c405534083e4fa4abb43e /security/integrity | |
| parent | LSM: Remove unused capability.c (diff) | |
| download | linux-5577857f8e26e9027271f10daf96361640907300.tar.xz linux-5577857f8e26e9027271f10daf96361640907300.zip | |
ima: cleanup ima_init_policy() a little
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>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index d1eefb9d65fb..e86b58d459e6 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -338,16 +338,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; |