diff options
| author | Jesper Juhl | 2005-06-25 23:58:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-26 01:25:00 +0200 |
| commit | 9a5f04bf798254390f89445ecf0b6f4c70ddc1f8 (patch) | |
| tree | ed9aa17d9d980f3f013ccc84e12135c65b51757d /security/selinux/ss/conditional.c | |
| parent | [PATCH] drivers/scsi/initio.c: cleanups (diff) | |
| download | kernel-qcow2-linux-9a5f04bf798254390f89445ecf0b6f4c70ddc1f8.tar.gz kernel-qcow2-linux-9a5f04bf798254390f89445ecf0b6f4c70ddc1f8.tar.xz kernel-qcow2-linux-9a5f04bf798254390f89445ecf0b6f4c70ddc1f8.zip | |
[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/ss/conditional.c')
| -rw-r--r-- | security/selinux/ss/conditional.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index b53441184aca..e2057f5a411a 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -166,16 +166,14 @@ static void cond_list_destroy(struct cond_node *list) void cond_policydb_destroy(struct policydb *p) { - if (p->bool_val_to_struct != NULL) - kfree(p->bool_val_to_struct); + kfree(p->bool_val_to_struct); avtab_destroy(&p->te_cond_avtab); cond_list_destroy(p->cond_list); } int cond_init_bool_indexes(struct policydb *p) { - if (p->bool_val_to_struct) - kfree(p->bool_val_to_struct); + kfree(p->bool_val_to_struct); p->bool_val_to_struct = (struct cond_bool_datum**) kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum*), GFP_KERNEL); if (!p->bool_val_to_struct) @@ -185,8 +183,7 @@ int cond_init_bool_indexes(struct policydb *p) int cond_destroy_bool(void *key, void *datum, void *p) { - if (key) - kfree(key); + kfree(key); kfree(datum); return 0; } |