aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_netlink.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-20 22:38:58 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-06-25 14:49:38 +0200
commit397304b52d9b726a4aed0bf9086612bba429d420 (patch)
treec62e2286241263623ce714aa24a1e7b59d25b749 /net/netfilter/nf_conntrack_netlink.c
parent5433ba365f6dd9f30899188755eb4b093314732c (diff)
downloadlinux-397304b52d9b726a4aed0bf9086612bba429d420.tar.gz
netfilter: ctnetlink: remove null test before kfree
Fix checkpatch warning: WARNING: kfree(NULL) is safe this check is probably not required Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 58579634427d2f..aee017f625d906 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -742,8 +742,7 @@ static int ctnetlink_done(struct netlink_callback *cb)
{
if (cb->args[1])
nf_ct_put((struct nf_conn *)cb->args[1]);
- if (cb->data)
- kfree(cb->data);
+ kfree(cb->data);
return 0;
}