diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:06 -0500 |
commit | a7f988ba304c5f6e78f937a06d120a0097b4d351 (patch) | |
tree | 7a19e078e12ff093fa7daa3ea207a8e442ebf0c7 /security/selinux | |
parent | b2325fe1b7e5654fac9e9419423aa2c58a3dbd83 (diff) |
[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>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/ss/policydb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 2f5f539875f2..0ac311dc8371 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c | |||
@@ -632,22 +632,22 @@ void policydb_destroy(struct policydb *p) | |||
632 | cond_policydb_destroy(p); | 632 | cond_policydb_destroy(p); |
633 | 633 | ||
634 | for (tr = p->role_tr; tr; tr = tr->next) { | 634 | for (tr = p->role_tr; tr; tr = tr->next) { |
635 | if (ltr) kfree(ltr); | 635 | kfree(ltr); |
636 | ltr = tr; | 636 | ltr = tr; |
637 | } | 637 | } |
638 | if (ltr) kfree(ltr); | 638 | kfree(ltr); |
639 | 639 | ||
640 | for (ra = p->role_allow; ra; ra = ra -> next) { | 640 | for (ra = p->role_allow; ra; ra = ra -> next) { |
641 | if (lra) kfree(lra); | 641 | kfree(lra); |
642 | lra = ra; | 642 | lra = ra; |
643 | } | 643 | } |
644 | if (lra) kfree(lra); | 644 | kfree(lra); |
645 | 645 | ||
646 | for (rt = p->range_tr; rt; rt = rt -> next) { | 646 | for (rt = p->range_tr; rt; rt = rt -> next) { |
647 | if (lrt) kfree(lrt); | 647 | kfree(lrt); |
648 | lrt = rt; | 648 | lrt = rt; |
649 | } | 649 | } |
650 | if (lrt) kfree(lrt); | 650 | kfree(lrt); |
651 | 651 | ||
652 | if (p->type_attr_map) { | 652 | if (p->type_attr_map) { |
653 | for (i = 0; i < p->p_types.nprim; i++) | 653 | for (i = 0; i < p->p_types.nprim; i++) |