netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] net/netfilter/ipvs/ip_vs_sync.c: remove null test before kfree
@ 2014-06-20 20:35 Fabian Frederick
  2014-06-23  2:20 ` Simon Horman
  0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2014-06-20 20:35 UTC (permalink / raw)
  To: linux-kernel; +Cc: Fabian Frederick, Wensong Zhang, Simon Horman, netdev

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

Cc: Wensong Zhang <wensong@linux-vs.org>
Cc: Simon Horman <horms@verge.net.au>
Cc: netdev@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] net/netfilter/ipvs/ip_vs_sync.c: remove null test before kfree
  2014-06-20 20:35 [PATCH 1/1] net/netfilter/ipvs/ip_vs_sync.c: remove null test before kfree Fabian Frederick
@ 2014-06-23  2:20 ` Simon Horman
  0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-06-23  2:20 UTC (permalink / raw)
  To: Fabian Frederick; +Cc: linux-kernel, Wensong Zhang, netdev

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 <wensong@linux-vs.org>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-06-23  2:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20 20:35 [PATCH 1/1] net/netfilter/ipvs/ip_vs_sync.c: remove null test before kfree Fabian Frederick
2014-06-23  2:20 ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).