ima: cleanup ima_init_policy() a little
Subsystems (4)
PATCH 1/1 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 <[email protected]>
security/integrity/ima/ima_policy.c +6 -10
@@ -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;
Quoted 1 line · Dan Carpenter
It's a bit easier to read this if we split it up into two for loops.
Agreed
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Mimi Zohar <[email protected]>
Mimi
Quoted 27 lines
security/integrity/ima/ima_policy.c +6
-10@@ -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;