2014-06-20 20:37:05

by Fabian Frédérick

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

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

Cc: Wensong Zhang <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
net/netfilter/ipvs/ip_vs_sync.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index db80126..eadffb2 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -886,8 +886,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
cp = ip_vs_conn_new(param, daddr, dport, flags, dest, fwmark);
rcu_read_unlock();
if (!cp) {
- if (param->pe_data)
- kfree(param->pe_data);
+ kfree(param->pe_data);
IP_VS_DBG(2, "BACKUP, add new conn. failed\n");
return;
}
--
1.8.4.5

2014-06-23 02:21:07

by Simon Horman

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

On Fri, Jun 20, 2014 at 10:35:42PM +0200, Fabian Frederick wrote:
> Fix checkpatch warning:
> WARNING: kfree(NULL) is safe this check is probably not required
>
> Cc: Wensong Zhang <[email protected]>
> Cc: Simon Horman <[email protected]>
> Cc: [email protected]
> Signed-off-by: Fabian Frederick <[email protected]>

Thanks, applied.

> ---
> net/netfilter/ipvs/ip_vs_sync.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index db80126..eadffb2 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -886,8 +886,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
> cp = ip_vs_conn_new(param, daddr, dport, flags, dest, fwmark);
> rcu_read_unlock();
> if (!cp) {
> - if (param->pe_data)
> - kfree(param->pe_data);
> + kfree(param->pe_data);
> IP_VS_DBG(2, "BACKUP, add new conn. failed\n");
> return;
> }
> --
> 1.8.4.5
>