public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Timo Teras <timo.teras@iki•fi>
To: Pravin B Shelar <pshelar@nicira•com>
Cc: netdev@vger•kernel.org
Subject: Re: [PATCH net] ip_tunnels: Use skb-len to PMTU check.
Date: Sun, 30 Jun 2013 10:50:03 +0300	[thread overview]
Message-ID: <20130630105003.0932fcd7@vostro> (raw)
In-Reply-To: <1372570818-15651-1-git-send-email-pshelar@nicira.com>

On Sat, 29 Jun 2013 22:40:18 -0700
Pravin B Shelar <pshelar@nicira•com> wrote:

> In path mtu check, ip header total length works for gre device
> but not for gre-tap device.  Use skb len which is consistent
> for all tunneling types.  This also fixes bug introduced by
> commit c54419321455631079c7d (GRE: Refactor GRE tunneling code).
> 
> Reported-by: Timo Teras <timo.teras@iki•fi>
> Signed-off-by: Pravin B Shelar <pshelar@nicira•com>
> ---
>  net/ipv4/ip_tunnel.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
> index 7fa8f08..4e9f530 100644
> --- a/net/ipv4/ip_tunnel.c
> +++ b/net/ipv4/ip_tunnel.c
> @@ -595,7 +595,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct
> net_device *dev, 
>  		if (!skb_is_gso(skb) &&
>  		    (inner_iph->frag_off&htons(IP_DF)) &&
> -		     mtu < ntohs(inner_iph->tot_len)) {
> +		     mtu < skb->len) {
>  			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu)); ip_rt_put(rt);
>  			goto tx_error;

I think icmp_send's mtu parameter should be adjusted too. Since it's
sent to the inner flow, but the mtu now is disregarding the possible
tunnel headers.

- Timo

      reply	other threads:[~2013-06-30  7:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-30  5:40 [PATCH net] ip_tunnels: Use skb-len to PMTU check Pravin B Shelar
2013-06-30  7:50 ` Timo Teras [this message]

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=20130630105003.0932fcd7@vostro \
    --to=timo.teras@iki$(echo .)fi \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=pshelar@nicira$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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