Message ID | 1526608674-12702-7-git-send-email-gvrose8192@gmail.com |
---|---|
State | Superseded |
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="dVOb3oAT"; 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 40nBGh6zpZz9s1w for <incoming@patchwork.ozlabs.org>; Fri, 18 May 2018 12:01:00 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 621A01050; Fri, 18 May 2018 01:58:32 +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 D0522A59 for <dev@openvswitch.org>; Fri, 18 May 2018 01:58:28 +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 65E1B6F3 for <dev@openvswitch.org>; Fri, 18 May 2018 01:58:28 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id l2-v6so2603798pgc.7 for <dev@openvswitch.org>; Thu, 17 May 2018 18:58:28 -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=5ZYWYIQnLYcN5JRanLVr/Od++GuLKbBc+0VVprZvyv0=; b=dVOb3oATVaJty4hmHgSkIl0G9InpSV+zCQxQYZB8ymVUEKP5rhLU/uTAEMXm2HYkWt ACqkRQyjTzfzveUUoV+0KO8MGu0MQjChzsE2SGAL/Nbt52u5A4Vnlu11kII20nReMnPy F1dAUqY7aZrhFbC0eLpt4fDMUttb5F6kbCUl6iiwoCpykLDsAugIn/Lm6IcvMXXAZJm4 0+41SdLD4dpYlSNrPfe9qfOyI23l64qXOw6rki+yBoaPahoabm+e8/5XKTsWMwMPlrGL SsJ5XdFhqYWlVVdmjs7Uf0towCKN0BSe9nNOfWfDzPxn+0ElskfBj6Td00ZyArSQ7Xho KadQ== 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=5ZYWYIQnLYcN5JRanLVr/Od++GuLKbBc+0VVprZvyv0=; b=s6AFR5r4e4gImxngwJnY3c4NqvdArjupkf35XGBpaJp87wCzi71BuqxZKjKFMhdS96 48O+JumLwtOi7rNtF5CndCYEisAXLcRQiJOKNoAQONz6IjHi+Klp5Qj4RAPTJEhgpVZu olVkgVaNyB4a0SEmccTpFB/W7CiopzN32K0oTAbmOAzdCMvk72beVdLHzYE+mNCwe6/4 TSRZ+0LhuNhlnCyxujyeIIwsqznI1lxUx6xx9djdzex6MaAkYtruE4ZKyhOsRMdKm725 j9oCSWvgVSQISiM5mgN7FqyeWxyCXHv2v4ChPW3yhDWVTeYx+edaBHLuN+5bQMwKDIaN rmCw== X-Gm-Message-State: ALKqPwef8hSckGCpRosUNrkbOWGjMqvvVpmcD0Vpp0Vci5c2KYos3HuH m7qB1gU2ew/De2cTDZ0XTxWTzQ== X-Google-Smtp-Source: AB8JxZqpDEN+EXezHaGS6NEM1X25mtX9S4UcWNA1QBbdi874hwfQb0MSph5iihkohN9s18zCvaV6iw== X-Received: by 2002:a63:a06a:: with SMTP id u42-v6mr5625478pgn.389.1526608707657; Thu, 17 May 2018 18:58:27 -0700 (PDT) Received: from gizo.domain (97-115-125-157.ptld.qwest.net. [97.115.125.157]) by smtp.gmail.com with ESMTPSA id d15-v6sm10564908pfh.97.2018.05.17.18.58.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 May 2018 18:58:27 -0700 (PDT) From: Greg Rose <gvrose8192@gmail.com> To: dev@openvswitch.org Date: Thu, 17 May 2018 18:57:19 -0700 Message-Id: <1526608674-12702-7-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526608674-12702-1-git-send-email-gvrose8192@gmail.com> References: <1526608674-12702-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 V2 06/41] 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 |
Add ERSPAN support
|
expand
|
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index a5ec59c..77d430e 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; }