diff options
author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-06-25 17:58:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:00 -0400 |
commit | 9a5f04bf798254390f89445ecf0b6f4c70ddc1f8 (patch) | |
tree | ed9aa17d9d980f3f013ccc84e12135c65b51757d /security/selinux/selinuxfs.c | |
parent | a2ba192c96d12447472e105890a9cd1b97952747 (diff) |
[PATCH] selinux: kfree cleanup
kfree(NULL) is legal.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux/selinuxfs.c')
-rw-r--r-- | security/selinux/selinuxfs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 07221568b505..8eb140dd2e4b 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -951,8 +951,7 @@ static int sel_make_bools(void) | |||
951 | u32 sid; | 951 | u32 sid; |
952 | 952 | ||
953 | /* remove any existing files */ | 953 | /* remove any existing files */ |
954 | if (bool_pending_values) | 954 | kfree(bool_pending_values); |
955 | kfree(bool_pending_values); | ||
956 | 955 | ||
957 | sel_remove_bools(dir); | 956 | sel_remove_bools(dir); |
958 | 957 | ||
@@ -997,10 +996,8 @@ static int sel_make_bools(void) | |||
997 | out: | 996 | out: |
998 | free_page((unsigned long)page); | 997 | free_page((unsigned long)page); |
999 | if (names) { | 998 | if (names) { |
1000 | for (i = 0; i < num; i++) { | 999 | for (i = 0; i < num; i++) |
1001 | if (names[i]) | 1000 | kfree(names[i]); |
1002 | kfree(names[i]); | ||
1003 | } | ||
1004 | kfree(names); | 1001 | kfree(names); |
1005 | } | 1002 | } |
1006 | return ret; | 1003 | return ret; |