Commit 723eb299 authored by Gao Feng's avatar Gao Feng Committed by Pablo Neira Ayuso

netfilter: ftp: Remove the useless dlen==0 condition check in find_pattern

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: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f0608cea
...@@ -301,8 +301,6 @@ static int find_pattern(const char *data, size_t dlen, ...@@ -301,8 +301,6 @@ static int find_pattern(const char *data, size_t dlen,
size_t i = plen; size_t i = plen;
pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen); pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen);
if (dlen == 0)
return 0;
if (dlen <= plen) { if (dlen <= plen) {
/* Short packet: try for partial? */ /* Short packet: try for partial? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment