From patchwork Wed Jul 16 01:11:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 370567 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E3E3414011E for ; Wed, 16 Jul 2014 11:11:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759950AbaGPBLo (ORCPT ); Tue, 15 Jul 2014 21:11:44 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:56552 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759628AbaGPBLi (ORCPT ); Tue, 15 Jul 2014 21:11:38 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (p8205-ipbfp1004kobeminato.hyogo.ocn.ne.jp [118.10.146.205]) by kirsty.vergenet.net (Postfix) with ESMTP id 6F9082671A1; Wed, 16 Jul 2014 11:11:34 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id EF803EDE916; Wed, 16 Jul 2014 10:11:32 +0900 (JST) From: Simon Horman To: Pablo Neira Ayuso Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Wensong Zhang , Julian Anastasov , Fabian Frederick , Simon Horman Subject: [PATCH 1/2] ipvs: remove null test before kfree Date: Wed, 16 Jul 2014 10:11:29 +0900 Message-Id: <1405473090-10432-2-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1405473090-10432-1-git-send-email-horms@verge.net.au> References: <1405473090-10432-1-git-send-email-horms@verge.net.au> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Fabian Frederick Fix checkpatch warning: WARNING: kfree(NULL) is safe this check is probably not required Signed-off-by: Fabian Frederick Signed-off-by: Simon Horman --- 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; }