Message ID | 1472727509-1025-1-git-send-email-fgao@ikuai8.com |
---|---|
State | Accepted |
Delegated to: | Pablo Neira |
Headers | show |
On Thu, Sep 01, 2016 at 06:58:29PM +0800, fgao@ikuai8.com wrote: > From: Gao Feng <fgao@ikuai8.com> > > 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. Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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? */