]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ima: Remove redundant policy rule set in add_rules()
authorKrzysztof Struczynski <krzysztof.struczynski@huawei.com>
Mon, 27 Apr 2020 10:28:58 +0000 (12:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:32:59 +0000 (09:32 +0200)
[ Upstream commit 6ee28442a465ab4c4be45e3b15015af24b1ba906 ]

Function ima_appraise_flag() returns the flag to be set in
temp_ima_appraise depending on the hook identifier passed as an argument.
It is not necessary to set the flag again for the POLICY_CHECK hook.

Signed-off-by: Krzysztof Struczynski <krzysztof.struczynski@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
security/integrity/ima/ima_policy.c

index 1c78cbbd27d883af3f2376d497b1605de2611f53..7414443c19bf1089cf0e2fe71d08e16a83f88253 100644 (file)
@@ -643,11 +643,8 @@ static void add_rules(struct ima_rule_entry *entries, int count,
 
                        list_add_tail(&entry->list, &ima_policy_rules);
                }
-               if (entries[i].action == APPRAISE) {
+               if (entries[i].action == APPRAISE)
                        temp_ima_appraise |= ima_appraise_flag(entries[i].func);
-                       if (entries[i].func == POLICY_CHECK)
-                               temp_ima_appraise |= IMA_APPRAISE_POLICY;
-               }
        }
 }