Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f988ba authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[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: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b2325fe1

security/keys/key.c

+1 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ struct key_user *key_user_lookup(uid_t uid) 
 found:

	atomic_inc(&user->usage);

	spin_unlock(&key_user_lock);

	if (candidate)

	kfree(candidate);

 out:

	return user;

security/selinux/ss/policydb.c

+6 −6
Original line number Diff line number Diff line
@@ -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++)