From patchwork Thu Mar 22 22:07:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 889673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HoQfcy0a"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 406gp56rcvz9s1B for ; Fri, 23 Mar 2018 09:10:05 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 82F31EE3; Thu, 22 Mar 2018 22:07:58 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 49493CE9 for ; Thu, 22 Mar 2018 22:07:55 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CAE68360 for ; Thu, 22 Mar 2018 22:07:54 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id n11so3814613pgp.4 for ; Thu, 22 Mar 2018 15:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pYjwKAxO9Jg1J/Gva1g/HR31RHMFtzjka0IWpeCci9w=; b=HoQfcy0aISF6P/gdbsVdQVQVJgwywvfhNIW7RnGhl5QqV0gLiTvNs+mgp0lrfp8Uxb 16/DUzTwnNqETx+OGhR5tBSXyYy772+skJVb0GU09gAHLi7f4xgM0P3E7jhkYVR0/NXs BXINDl1Dhzi4s+AcVjqturCWMFDQncqAGZNWIOvefXQOG61EhhApBU3aLYr0Fxqy9Ycm lTDBh+GZzXM07pLrEyVifODKkLRGH9U4KpkBuxsaRfhc6wnS4kDS1hCiKEjjTWXku97c bnGp87/6Cz5r2U0vNBXANqoE4RcOR39lYlcHiPF66JmSAjI8jsb98cnbDg5MymLiknDD GoEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pYjwKAxO9Jg1J/Gva1g/HR31RHMFtzjka0IWpeCci9w=; b=boSjgzA4ULFBRqQU6eJrjPw3vMUEsQkNFuAfr6gn6FERKq266wczWaR9tLr0K3NIjg M1v+2Ap7ad75T4Sbi9lp2oSVtc7UnKACcnfZUunExUmBio1EalxFiD5Zc2ZenMdUw+pN AWvteuAAu627PbocT+aTAJNjf3c2sJGGY8V3k7E3k5Uq/qKFxacnPCNHRZa0exX0tISP ac36rigNRQD1LREMPtgvb4OK4LTruLlIVOhMXK+II2AvMXP0cXOVLM7kfqKAd9YUbxlp ARCDBjwvTb8WT/MAYT4cya1+QpEPLA59pL7X/B6nRrN5o2jfceS//GPSrJEHj8RZqGV0 rYyA== X-Gm-Message-State: AElRT7HZoZWht7fBT24DQX0aL1JrM5o1N7gGg2pvwJHDQLPabcQ2yY2B ChcGwPxLU/iZ7Kk+3AM9EsqEFA== X-Google-Smtp-Source: AG47ELvHSSRjaWBtHbbaqp6DQ1zhknpPLGAJ8cBfOnU81corZM89gswN9DrTjn/080oHjSOGGLevag== X-Received: by 10.98.16.131 with SMTP id 3mr21986176pfq.188.1521756474003; Thu, 22 Mar 2018 15:07:54 -0700 (PDT) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id 4sm2280775pfn.32.2018.03.22.15.07.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 15:07:53 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Thu, 22 Mar 2018 15:07:21 -0700 Message-Id: <1521756461-3870-6-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1521756461-3870-1-git-send-email-gvrose8192@gmail.com> References: <1521756461-3870-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [ERSPAN RFC 05/25] ip_gre: check packet length and mtu correctly in erspan tx X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: William Tu Upstream commit: commit f192970de860d3ab90aa9e2a22853201a57bde78 Author: William Tu Date: Thu Oct 5 12:07:12 2017 -0700 ip_gre: check packet length and mtu correctly in erspan tx Similarly to early patch for erspan_xmit(), the ARPHDR_ETHER device is the length of the whole ether packet. So skb->len should subtract the dev->hard_header_len. Fixes: 1a66a836da63 ("gre: add collect_md mode to ERSPAN tunnel") Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") Signed-off-by: William Tu Cc: Xin Long Cc: David Laight Reviewed-by: Xin Long Signed-off-by: David S. Miller Cc: William Tu Signed-off-by: Greg Rose --- datapath/linux/compat/ip_gre.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index d0f112d..af9fbb3 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -544,8 +544,8 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev, if (gre_handle_offloads(skb, false)) goto err_free_rt; - if (skb->len > dev->mtu) { - pskb_trim(skb, dev->mtu); + if (skb->len > dev->mtu + dev->hard_header_len) { + pskb_trim(skb, dev->mtu + dev->hard_header_len); truncate = true; } @@ -811,8 +811,8 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb, if (skb_cow_head(skb, dev->needed_headroom)) goto free_skb; - if (skb->len > dev->mtu) { - pskb_trim(skb, dev->mtu); + if (skb->len > dev->mtu + dev->hard_header_len) { + pskb_trim(skb, dev->mtu + dev->hard_header_len); truncate = true; }