From: Jiri Benc <jbenc@redhat.com>
To: Eric Dumazet <edumazet@google.com>
Cc: "David S . Miller" <davem@davemloft.net>,
netdev <netdev@vger.kernel.org>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: Re: [PATCH net] nsh: fix infinite loop
Date: Fri, 4 May 2018 09:23:59 +0200 [thread overview]
Message-ID: <20180504092359.7a78a74a@redhat.com> (raw)
In-Reply-To: <20180503203754.60611-1-edumazet@google.com>
On Thu, 3 May 2018 13:37:54 -0700, Eric Dumazet wrote:
> diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c
> index d7da99a0b0b852d7459eed9ac6d3cdf3d49a1a1c..9696ef96b719bf24625adea2a959deac1d2a975f 100644
> --- a/net/nsh/nsh.c
> +++ b/net/nsh/nsh.c
> @@ -57,6 +57,8 @@ int nsh_pop(struct sk_buff *skb)
> return -ENOMEM;
> nh = (struct nshhdr *)(skb->data);
> length = nsh_hdr_len(nh);
> + if (length < NSH_BASE_HDR_LEN)
> + return -EINVAL;
> inner_proto = tun_p_to_eth_p(nh->np);
> if (!pskb_may_pull(skb, length))
> return -ENOMEM;
> @@ -90,6 +92,8 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
> if (unlikely(!pskb_may_pull(skb, NSH_BASE_HDR_LEN)))
> goto out;
> nsh_len = nsh_hdr_len(nsh_hdr(skb));
> + if (nsh_len < NSH_BASE_HDR_LEN)
> + goto out;
> if (unlikely(!pskb_may_pull(skb, nsh_len)))
> goto out;
>
Acked-by: Jiri Benc <jbenc@redhat.com>
Thanks, Eric, and shame on me!
Jiri
next prev parent reply other threads:[~2018-05-04 7:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-03 20:37 [PATCH net] nsh: fix infinite loop Eric Dumazet
2018-05-04 7:23 ` Jiri Benc [this message]
2018-05-04 16:55 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180504092359.7a78a74a@redhat.com \
--to=jbenc@redhat.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).