Re: [apparmor] [RESEND PATCH] apparmor: Remove unnecessary NULL check before kvfree()

[John Johansen]

On 11/7/24 03:25, Thorsten Blum wrote:

Since kvfree() already checks if its argument is NULL, an additional
check before calling kvfree() is unnecessary and can be removed.

Remove it and the following Coccinelle/coccicheck warning reported by
ifnullfree.cocci:

   WARNING: NULL check before some freeing functions is not needed

Signed-off-by: Thorsten Blum <thorsten.b...@linux.dev>

sorry I am way way behind on this. I am going to work through the backlog
on this list today.

Acked-by: John Johansen <john.johan...@canonical.com>

I have pulled this in to my local tree, and will push it up in a few
hours once I been through the other patches and testing.

---
  security/apparmor/policy.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 14df15e35695..ce1c96cb2aed 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -103,8 +103,7 @@ static void aa_free_pdb(struct aa_policydb *pdb)
  {
        if (pdb) {
                aa_put_dfa(pdb->dfa);
-               if (pdb->perms)
-                       kvfree(pdb->perms);
+               kvfree(pdb->perms);
                aa_free_str_table(&pdb->trans);
                kfree(pdb);
        }