Skip to content

Commit

Permalink
[PATCH] kfree cleanup: security
Browse files Browse the repository at this point in the history
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 <jesper.juhl@gmail.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jesper Juhl authored and Linus Torvalds committed Nov 7, 2005
1 parent b2325fe commit a7f988b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions security/keys/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ struct key_user *key_user_lookup(uid_t uid)
found:
atomic_inc(&user->usage);
spin_unlock(&key_user_lock);
if (candidate)
kfree(candidate);
kfree(candidate);
out:
return user;

Expand Down
12 changes: 6 additions & 6 deletions security/selinux/ss/policydb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

if (p->type_attr_map) {
for (i = 0; i < p->p_types.nprim; i++)
Expand Down

0 comments on commit a7f988b

Please sign in to comment.