2014-06-20 20:40:19

by Fabian Frédérick

Subject: [PATCH 1/1] net/netfilter/nf_conntrack_netlink.c: remove null test before kfree

Fix checkpatch warning:
WARNING: kfree(NULL) is safe this check is probably not required

Cc: Pablo Neira Ayuso <[email protected]>
Cc: Patrick McHardy <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
net/netfilter/nf_conntrack_netlink.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 5857963..aee017f 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;
}

--
1.8.4.5

2014-06-25 12:56:31

by Pablo Neira Ayuso

Subject: Re: [PATCH 1/1] net/netfilter/nf_conntrack_netlink.c: remove null test before kfree

On Fri, Jun 20, 2014 at 10:38:58PM +0200, Fabian Frederick wrote:
> Fix checkpatch warning:
> WARNING: kfree(NULL) is safe this check is probably not required

Applied, thanks.