From patchwork Wed Mar 15 02:11:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 739008 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 3vjZrK3Hbyz9s03 for ; Wed, 15 Mar 2017 13:12:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750847AbdCOCMs (ORCPT ); Tue, 14 Mar 2017 22:12:48 -0400 Received: from SMTPBG252.QQ.COM ([183.60.52.105]:40609 "EHLO smtpbg252.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750774AbdCOCMs (ORCPT ); Tue, 14 Mar 2017 22:12:48 -0400 X-QQ-mid: bizesmtp4t1489543876t5sw37jpw Received: from ikuai8.com (unknown [114.242.17.234]) by esmtp4.qq.com (ESMTP) with id ; Wed, 15 Mar 2017 10:11:10 +0800 (CST) X-QQ-SSF: 01400000002000F0FI40000A0000000 X-QQ-FEAT: IhrZBUlRAsgVZ1LMyozOX90a3Hxap91uB8ZsfMifkCdyaptCfePJZYhVo8anI JPzxsnHySmElCuKfARzH56yVQ0O7PS/+CsDVFJDlhzok8G2/taOytkYmd6LYsq9tSR23q/n OruORzaC4XTFGnRpDo26ls+xdRIdv6EdtFEVCjLBsOagWFLPKGdWQ6y13uYwbWNPzXPNGT7 AWlepFaSh1N2L2gQHGRumt2FOtocHM+jrzleBTQGdHchFc+ANpuxCDRw73YkTS1MKVv47iQ Q6PH1yoK96ahhi X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: pablo@netfilter.org, netfilter-devel@vger.kernel.org, gfree.wind@gmail.com Cc: Gao Feng Subject: [PATCH nf-next 1/1] netfilter: ctlink: Remove duplicated condition check in nfnl_cthelper_create Date: Wed, 15 Mar 2017 10:11:08 +0800 Message-Id: <1489543868-66151-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Gao Feng Because its caller nfnl_cthelper_new has already checked the tb[NFCTH_TUPLE], so it is unnecessary to check it again in nfnl_cthelper_create. Signed-off-by: Gao Feng --- net/netfilter/nfnetlink_cthelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index de87823..6649578 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -205,7 +205,7 @@ struct nf_conntrack_helper *helper; int ret; - if (!tb[NFCTH_TUPLE] || !tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN]) + if (!tb[NFCTH_POLICY] || !tb[NFCTH_PRIV_DATA_LEN]) return -EINVAL; helper = kzalloc(sizeof(struct nf_conntrack_helper), GFP_KERNEL);