From patchwork Wed Dec 20 15:39:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Garver X-Patchwork-Id: 851529 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z1zTw4c5yz9s1h for ; Thu, 21 Dec 2017 02:39:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755452AbdLTPja (ORCPT ); Wed, 20 Dec 2017 10:39:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46252 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755271AbdLTPj3 (ORCPT ); Wed, 20 Dec 2017 10:39:29 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C8F4883B0; Wed, 20 Dec 2017 15:39:28 +0000 (UTC) Received: from dev-rhel7.localdomain (wsfd-netdev-vmhost.ntdv.lab.eng.bos.redhat.com [10.19.188.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAEF85D969; Wed, 20 Dec 2017 15:39:27 +0000 (UTC) From: Eric Garver To: netdev@vger.kernel.org Cc: ovs-dev@openvswitch.org, Jiri Benc Subject: [PATCH net v2] openvswitch: Fix pop_vlan action for double tagged frames Date: Wed, 20 Dec 2017 10:39:32 -0500 Message-Id: <20171220153932.1362-1-e@erig.me> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 20 Dec 2017 15:39:28 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb_vlan_pop() expects skb->protocol to be a valid TPID for double tagged frames, but skb->protocol is set to the ethertype by key_extract(). So temporarily set it to the TPID when doing a pop_vlan. Fixes: 5108bbaddc37 ("openvswitch: add processing of L3 packets") Signed-off-by: Eric Garver --- net/openvswitch/actions.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 30a5df27116e..c484e0941047 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -280,6 +280,13 @@ static int set_mpls(struct sk_buff *skb, struct sw_flow_key *flow_key, static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key) { int err; + __be16 proto = skb->protocol; + + /* skb->protocol is set to the inner most parsed ethertype. To satisfy + * skb_vlan_pop() for multi-tagged frames we must set it to the tpid. + */ + if (is_flow_key_valid(key) && key->eth.vlan.tci && key->eth.cvlan.tci) + skb->protocol = key->eth.cvlan.tpid; err = skb_vlan_pop(skb); if (skb_vlan_tag_present(skb)) { @@ -288,6 +295,9 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key) key->eth.vlan.tci = 0; key->eth.vlan.tpid = 0; } + + skb->protocol = proto; + return err; }