From patchwork Thu Sep 1 10:58:29 2016 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: 664891 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 3sPzxw56nTz9s4x for ; Thu, 1 Sep 2016 21:08:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752549AbcIALID (ORCPT ); Thu, 1 Sep 2016 07:08:03 -0400 Received: from SMTPBG179.QQ.COM ([119.147.194.222]:41938 "EHLO smtpbg179.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751606AbcIALID (ORCPT ); Thu, 1 Sep 2016 07:08:03 -0400 X-Greylist: delayed 378 seconds by postgrey-1.27 at vger.kernel.org; Thu, 01 Sep 2016 07:08:02 EDT X-QQ-mid: bizesmtp14t1472727530t25roqrc Received: from localhost.localdomain (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Thu, 01 Sep 2016 18:58:30 +0800 (CST) X-QQ-SSF: 01400000004000F0FG30000A0000000 X-QQ-FEAT: NviVax2pLsWkt8X1j5kmz26PJ6jl4OhXZxNTltsjBtZ1cMCnjRqmqbb0edBt2 DQxMCk1MJilhsGOk8B078eP1T7hEukkJ+OZhfvby+6hmmk7grawEFoSjiLVGJK7aXMyDVuQ 6QYeaogOvh/DVZpu3kANWw3TAjdQgJ630fhvmFLGBeYI0jthNBbtzPcRS1zRm2n1cBIImUm qfOFxtuTd2Akt+Tass6l40S8CGCJK9WWfOUm838l38o4OTvWBrR2Dd5DwcLVTYFpF8RNVqt +/c2HAtrfrHfs6 X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: pablo@netfilter.org, kadlec@blackhole.kfki.hu, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: gfree.wind@gmail.com, Gao Feng Subject: [PATCH v2 1/2 nf-next] netfilter: ftp: Remove the useless dlen==0 condition check in find_pattern Date: Thu, 1 Sep 2016 18:58:29 +0800 Message-Id: <1472727509-1025-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 The caller function "help" has already make sure the datalen could not be zero before invoke find_pattern as a parameter by the following codes if (dataoff >= skb->len) { pr_debug("ftp: dataoff(%u) >= skblen(%u)\n", dataoff, skb->len); return NF_ACCEPT; } datalen = skb->len - dataoff; And the latter codes "ends_in_nl = (fb_ptr[datalen - 1] == '\n');" use datalen directly without checking if it is zero. So it is unneccessary to check it in find_pattern too. Signed-off-by: Gao Feng --- v2: Split original patch to two commits; v1: Initial patch net/netfilter/nf_conntrack_ftp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index b6934b5..d49a2d4 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -301,8 +301,6 @@ static int find_pattern(const char *data, size_t dlen, size_t i = plen; pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen); - if (dlen == 0) - return 0; if (dlen <= plen) { /* Short packet: try for partial? */