Message ID | 1524673309-30044-7-git-send-email-gvrose8192@gmail.com |
---|---|
State | Deferred |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> 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=<UNKNOWN>) 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="eOQWhkQc"; 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 40WQrK3m3qz9rxx for <incoming@patchwork.ozlabs.org>; Thu, 26 Apr 2018 02:38:57 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E8D57CFC; Wed, 25 Apr 2018 16:22:05 +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 CF3CABC2 for <dev@openvswitch.org>; Wed, 25 Apr 2018 16:22:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6B63E42D for <dev@openvswitch.org>; Wed, 25 Apr 2018 16:22:01 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id f15so15662660pfn.0 for <dev@openvswitch.org>; Wed, 25 Apr 2018 09:22:01 -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=htdMQfAMCRCdV6e3KpQojUguSmx+knu7u1XIzuseakU=; b=eOQWhkQcHSl+9GR3EDf3FxPAX+aheO8AGfE8jWLC7Pp/m9stl3cv86ltFu/7XEifpY vVHl3iJvBiYenP5t0YhPfVpKpYxAt5j/vHG/8chzUml9j07wbVee5pO/yf0OyKuBullE fw5wolcniD4ORi2GRu69Z7v65w2+21oKdxHte6L4bUZyM7ZswiUxx948kJUdGFc6B83L lXf3BCfsxvq/sGVNRe20ntfvoNGj193afVPZ6dMNrYOjsKZj4iKPSK2QW0krC1AjqOge 7oith5BpUvDJMnK0S7e0mA/rgyrR4Pl4gtQwEoptpjxR5jZrKbKhVlNnRUMmSo6GMUPE L0Fw== 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=htdMQfAMCRCdV6e3KpQojUguSmx+knu7u1XIzuseakU=; b=duzjySqrQruu8GXKNDf9Znif4DcTKxLaN83njdxniX30o3nG66W3Z979voBqZvio6b KrOUAkF70mZn3q71UzacZc4s/SIFlgEfvLrfHQNSgL41vwm9XWTOD0TQE5LhIJ4JKG3P ERXwLKTGBY5Nb/M4HaDZzghyku8nnE7qFDqojDaGQCkUgU9yqyp2Up9y1gTs+eh3BXFD oO5EUJ27XkSegnW0L1oVAzm2d0YBlTqetxc/K72n3L+WVYzSCwgAvEiAXZC/VXkzJhEq 2C/fqcYr0ofzFKS7m0pNAdBnd4TRpAWY9utySBlwNDth5uH+7V3zyFl97zH5snabfWZy ll4w== X-Gm-Message-State: ALQs6tD8zPD3AfKLqSmtPmKA4ACoZWuv2gbDiyJ+Z18Cfs3mjUPVzfzj Km187QGE9xcV/txWsBeykOVjBg== X-Google-Smtp-Source: AIpwx4+gKkRJteexkmcGgs5malQ+f9BKeEZj51pgSei9+76HeaUyuVKSSP/ooa7ohvUjHNZWr6ImnA== X-Received: by 10.98.76.68 with SMTP id z65mr28806889pfa.181.1524673320672; Wed, 25 Apr 2018 09:22:00 -0700 (PDT) Received: from gizo.domain (67-5-146-204.ptld.qwest.net. [67.5.146.204]) by smtp.gmail.com with ESMTPSA id o64sm32800694pfb.62.2018.04.25.09.21.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 09:22:00 -0700 (PDT) From: Greg Rose <gvrose8192@gmail.com> To: dev@openvswitch.org, pshelar@ovn.org Date: Wed, 25 Apr 2018 09:21:44 -0700 Message-Id: <1524673309-30044-7-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524673309-30044-1-git-send-email-gvrose8192@gmail.com> References: <1524673309-30044-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] [PATCH 06/11] 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: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org |
Series |
Patches 1-11 of ERSPAN backport
|
expand
|
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 1295fc5..2377d82 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -996,8 +996,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; }