From: Jesper Juhl This is the security/ part of the big kfree cleanup patch. Remove pointless checks for NULL prior to calling kfree() in security/. Signed-off-by: Jesper Juhl Acked-by: James Morris Signed-off-by: Andrew Morton --- security/keys/key.c | 3 +-- security/selinux/ss/policydb.c | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff -puN security/keys/key.c~kfree-cleanup-security security/keys/key.c --- devel/security/keys/key.c~kfree-cleanup-security 2005-10-14 01:45:02.000000000 -0700 +++ devel-akpm/security/keys/key.c 2005-10-14 01:45:02.000000000 -0700 @@ -115,8 +115,7 @@ struct key_user *key_user_lookup(uid_t u found: atomic_inc(&user->usage); spin_unlock(&key_user_lock); - if (candidate) - kfree(candidate); + kfree(candidate); out: return user; diff -puN security/selinux/ss/policydb.c~kfree-cleanup-security security/selinux/ss/policydb.c --- devel/security/selinux/ss/policydb.c~kfree-cleanup-security 2005-10-14 01:45:02.000000000 -0700 +++ devel-akpm/security/selinux/ss/policydb.c 2005-10-14 01:45:02.000000000 -0700 @@ -632,22 +632,22 @@ void policydb_destroy(struct policydb *p cond_policydb_destroy(p); for (tr = p->role_tr; tr; tr = tr->next) { - if (ltr) kfree(ltr); + kfree(ltr); ltr = tr; } - if (ltr) kfree(ltr); + kfree(ltr); for (ra = p->role_allow; ra; ra = ra -> next) { - if (lra) kfree(lra); + kfree(lra); lra = ra; } - if (lra) kfree(lra); + kfree(lra); for (rt = p->range_tr; rt; rt = rt -> next) { - if (lrt) kfree(lrt); + kfree(lrt); lrt = rt; } - if (lrt) kfree(lrt); + kfree(lrt); for (i = 0; i < p->p_types.nprim; i++) ebitmap_destroy(&p->type_attr_map[i]); _