Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[PATCH] kfree cleanup: security 

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>
This commit is contained in:
Jesper Juhl 2005-11-07 01:01:35 -08:00 committed by Linus Torvalds
parent b2325fe1b7
commit a7f988ba30
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/keys/key.c
View File

@ -115,8 +115,7 @@ struct key_user *key_user_lookup(uid_t uid)
found: found:
atomic_inc(&user->usage); atomic_inc(&user->usage);
spin_unlock(&key_user_lock); spin_unlock(&key_user_lock);
if (candidate) kfree(candidate);
kfree(candidate);
out: out:
return user; return user;

12
security/selinux/ss/policydb.c
View File

@ -632,22 +632,22 @@ void policydb_destroy(struct policydb *p)
cond_policydb_destroy(p); cond_policydb_destroy(p);
for (tr = p->role_tr; tr; tr = tr->next) { for (tr = p->role_tr; tr; tr = tr->next) {
if (ltr) kfree(ltr); kfree(ltr);
ltr = tr; ltr = tr;
} }
if (ltr) kfree(ltr); kfree(ltr);
for (ra = p->role_allow; ra; ra = ra -> next) { for (ra = p->role_allow; ra; ra = ra -> next) {
if (lra) kfree(lra); kfree(lra);
lra = ra; lra = ra;
} }
if (lra) kfree(lra); kfree(lra);
for (rt = p->range_tr; rt; rt = rt -> next) { for (rt = p->range_tr; rt; rt = rt -> next) {
if (lrt) kfree(lrt); kfree(lrt);
lrt = rt; lrt = rt;
} }
if (lrt) kfree(lrt); kfree(lrt);
if (p->type_attr_map) { if (p->type_attr_map) {
for (i = 0; i < p->p_types.nprim; i++) for (i = 0; i < p->p_types.nprim; i++)