netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Benc <jbenc@redhat.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "David Miller" <davem@davemloft.net>,
	netdev <netdev@vger.kernel.org>,
	"Tom Herbert" <tom@herbertland.com>,
	"Maciej Żenczykowski" <maze@google.com>
Subject: Re: [PATCH v2 net] gre: fix error handler
Date: Thu, 16 Jun 2016 09:40:58 +0200	[thread overview]
Message-ID: <20160616094059.6ce42eb6@griffin> (raw)
In-Reply-To: <1465997040.7945.207.camel@edumazet-glaptop3.roam.corp.google.com>

On Wed, 15 Jun 2016 06:24:00 -0700, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> 1) gre_parse_header() can be called from gre_err()
> 
>    At this point transport header points to ICMP header, not the inner
> header.
> 
> 2) We can not really change transport header as ipgre_err() will later
> assume transport header still points to ICMP header (using icmp_hdr())
> 
> 3) pskb_may_pull() logic in gre_parse_header() really works
>   if we are interested at zone pointed by skb->data
> 
> 4) As Jiri explained in commit b7f8fe251e46 ("gre: do not pull header in
> ICMP error processing") we should not pull headers in error handler.
> 
> So this fix :
> 
> A) changes gre_parse_header() to use skb->data instead of
> skb_transport_header()
> 
> B) Adds a nhs parameter to gre_parse_header() so that we can skip the
> not pulled IP header from error path.
>   This offset is 0 for normal receive path.
> 
> C) remove obsolete IPV6 includes
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Tom Herbert <tom@herbertland.com>
> Cc: Maciej Żenczykowski <maze@google.com>
> Cc: Jiri Benc <jbenc@redhat.com>

Reviewed-by: Jiri Benc <jbenc@redhat.com>

I know this has already been applied. Didn't get to it earlier, sorry.
The patch looks good. Thanks!

 Jiri

  parent reply	other threads:[~2016-06-16  7:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15  5:15 [PATCH net] gre: fix error handler Eric Dumazet
2016-06-15  5:45 ` Eric Dumazet
2016-06-15 13:24   ` [PATCH v2 " Eric Dumazet
2016-06-16  5:15     ` David Miller
2016-06-16  7:40     ` Jiri Benc [this message]
2016-06-16 11:40       ` Eric Dumazet

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=20160616094059.6ce42eb6@griffin \
    --to=jbenc@redhat.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=maze@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=tom@herbertland.com \
    /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).