]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.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)
committerKhalid Elmously <khalid.elmously@canonical.com>
Sat, 8 Aug 2020 05:53:12 +0000 (01:53 -0400)
BugLink: https://bugs.launchpad.net/bugs/1885023
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
security/integrity/ima/ima_policy.c

index 110f36f5bc22d8afc9f8dfd0b6f9da6ad0098bc6..eb7d99fbae2dbfc5d7ceaf4295d9bbdbab7ec7b9 100644 (file)
@@ -590,11 +590,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;
-               }
        }
 }