From patchwork Thu Aug 29 17:55:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1155455 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="dXbj1zZ1"; 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 46K9S86mkVz9s4Y for ; Fri, 30 Aug 2019 04:02:32 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 87FB94CA9; Thu, 29 Aug 2019 17:57:34 +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 76EF64BAD for ; Thu, 29 Aug 2019 17:55:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 8026013A for ; Thu, 29 Aug 2019 17:55:55 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id d1so1988289pgp.4 for ; Thu, 29 Aug 2019 10:55:55 -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=9TWNkrtqoSMZGOaH5Kn9ARtfQMizfoP59irawbspN3E=; b=dXbj1zZ1PPA1VWpdSVVgKUdDkMkIIzkag6FoHxkv91H5OywiiZiJrqFZZZT9qStwrD kv7vKoPuYA7rwPvkEgdMj0IZItjtzPV64LchF/OnntWUihhjtaPXyhi4zUNTRKwj4OTZ pAHVIIxzugJfrHx/Aqa67fwk0YJw1DPz+TVOi7Mct+RYG47QY7AuJlzZTF1Ai3QTBqaX 7oH6gup/XShFUvYDRT1q6FL4He4c/ueSb07kjqujq0VL3WOPUiffTzMohSJPeZ0hjrDw xfcwwn7C3HcayRTHgh5liYFzfuv63w40y36+JkiSUFX83Gy8lt5rioJzPWv3aJEDdKQZ lsdA== 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=9TWNkrtqoSMZGOaH5Kn9ARtfQMizfoP59irawbspN3E=; b=UNUt2XioqIiTCecQ4uiQtB2h3N9rUpCJADloGBGPygjhqFnqZdkwkGBMcrpZS4/3l/ 5i97x46pfHLy9Ls6eJlrvIxUgL6OtqM2uw1J5o5Sl+9ZzCfBfqw3fLSWpGpRfFBrFdEm oU7o/bW23k0D3kO5GJvx4qPd0dZhD3nJ/Zi13iOXgVYg01AsRTWlazmTtmQzlo9qb7sK GlCeNJ1u5S9FZSuYIBwyef1NGi2ouVJKeUPwYM+zcqfxQAxDd4tMxK4laRkdXGU7Wveu vV97s9hg6EGMZXB5xbbfUfCWcaFxBd8e/Xb7BzstjDV5SZUEQWVHKkapxbWS6emvXEaR BnFA== X-Gm-Message-State: APjAAAVp37Z3bYV+wTjSr1cWPKQqXllvx5p33Qayt3rhlYXD8x8bpfyb YrIgOosulqFoAGU2AnyBLBDvCGel X-Google-Smtp-Source: APXvYqwaVij9vgYm6eIUwkKomliDpWLxCn0FmBkjBNvUProqPy/QiwTW2eWnrjnPbiJcjDdwjPrjrw== X-Received: by 2002:a62:1715:: with SMTP id 21mr13132825pfx.134.1567101354823; Thu, 29 Aug 2019 10:55:54 -0700 (PDT) Received: from gizo.domain (97-115-90-227.ptld.qwest.net. [97.115.90.227]) by smtp.gmail.com with ESMTPSA id g2sm3846840pfm.32.2019.08.29.10.55.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 10:55:54 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org, jpettit@ovn.org Date: Thu, 29 Aug 2019 10:55:50 -0700 Message-Id: <1567101350-27905-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1567101350-27905-1-git-send-email-gvrose8192@gmail.com> References: <1567101350-27905-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 branch-2.8 2/2] datapath: Clear the L4 portion of the key for "later" fragments 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: Justin Pettit Upstream commit: commit 0754b4e8cdf3eec6e4122e79af26ed9bab20f8f8 Author: Justin Pettit Date: Tue Aug 27 07:58:10 2019 -0700 openvswitch: Clear the L4 portion of the key for "later" fragments. Only the first fragment in a datagram contains the L4 headers. When the Open vSwitch module parses a packet, it always sets the IP protocol field in the key, but can only set the L4 fields on the first fragment. The original behavior would not clear the L4 portion of the key, so garbage values would be sent in the key for "later" fragments. This patch clears the L4 fields in that circumstance to prevent sending those garbage values as part of the upcall. Signed-off-by: Justin Pettit Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Signed-off-by: Greg Rose Signed-off-by: Justin Pettit --- datapath/flow.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datapath/flow.c b/datapath/flow.c index 083288f..92fc6ac 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -529,6 +529,7 @@ static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key) offset = nh->frag_off & htons(IP_OFFSET); if (offset) { key->ip.frag = OVS_FRAG_TYPE_LATER; + memset(&key->tp, 0, sizeof(key->tp)); return 0; } if (nh->frag_off & htons(IP_MF) || @@ -647,8 +648,11 @@ static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key) return error; } - if (key->ip.frag == OVS_FRAG_TYPE_LATER) + if (key->ip.frag == OVS_FRAG_TYPE_LATER) { + memset(&key->tp, 0, sizeof(key->tp)); return 0; + } +#ifdef HAVE_SKB_GSO_UDP if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) key->ip.frag = OVS_FRAG_TYPE_FIRST;