From patchwork Sun Jun 30 05:40:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 255869 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E84662C009C for ; Sun, 30 Jun 2013 15:40:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750968Ab3F3FkY (ORCPT ); Sun, 30 Jun 2013 01:40:24 -0400 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:33780 "HELO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750744Ab3F3FkX (ORCPT ); Sun, 30 Jun 2013 01:40:23 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKUc/Ex6UWUcpZZgDb8Oa3p2THHxfJvCLZ@postini.com; Sat, 29 Jun 2013 22:40:23 PDT Received: by mail-pa0-f49.google.com with SMTP id ld11so3822650pab.36 for ; Sat, 29 Jun 2013 22:40:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=ZFMsGGiMKvzBVIArwaS8IoLlfZb+r7BOWQcARGjXCvE=; b=YJW5paMLHB706oxixeYy/vwv+OF6XITKgSWC2+2jLLLDyz8DJjpQbAlVj/ussySGVf q7VwSZOGwyI/LRdJMJeyc3xGe6HfjD88iE/4FC3tqveTXWctVvjhymteU1aYnaRH8dm5 FhWzScqCAe4DJRLTuyKa7OsAXCxz7xXijH7h4rlx0uD/YlNdzr1L4Usqa63xslKdF0sk Hhwjvc9OJXBaVv62rGdj5X7dXKAIqx9Hf/Sz1Gpy6DGsO/QjZdDJkIZbuARfmpAnO5P5 5Qz/6zw2ndJHturcvN3vdZah2wf+ffNeYsyiJemnHkGBq2bNDIMPHp0iS0I5p/pzVK8l P7cA== X-Received: by 10.66.48.201 with SMTP id o9mr18588003pan.76.1372570823067; Sat, 29 Jun 2013 22:40:23 -0700 (PDT) X-Received: by 10.66.48.201 with SMTP id o9mr18587996pan.76.1372570822943; Sat, 29 Jun 2013 22:40:22 -0700 (PDT) Received: from localhost ([75.98.92.113]) by mx.google.com with ESMTPSA id ib9sm15793721pbc.43.2013.06.29.22.40.21 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Sat, 29 Jun 2013 22:40:22 -0700 (PDT) From: Pravin B Shelar To: netdev@vger.kernel.org Cc: timo.teras@iki.fi, Pravin B Shelar Subject: [PATCH net] ip_tunnels: Use skb-len to PMTU check. Date: Sat, 29 Jun 2013 22:40:18 -0700 Message-Id: <1372570818-15651-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.8.2.135.g7b592fa X-Gm-Message-State: ALoCoQnsqsinjqNUthKmGKgQfvHzT4lX75fIK0cqfSWM5xGZBcKdHUMCVQLXq0LF7Lzga4VQaLiSR63DIeqpPa0NUH5d+yGv6pxUQSEZ/tg9pWzXK/lUF5J41H14FPtsrw2SakQyu+XcodlmF6oqgeVQr1asMYZIzcRfFLPHuWji7yS9ILEfBtM= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Pravin B Shelar --- 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;