Patch "openvswitch: Fix ovs_flow_key_update()" has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

openvswitch: Fix ovs_flow_key_update()

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
openvswitch-fix-ovs_flow_key_update.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Yi-Hung Wei <[email protected]>
Date: Thu, 30 Mar 2017 12:36:03 -0700
Subject: openvswitch: Fix ovs_flow_key_update()

From: Yi-Hung Wei <[email protected]>

[ Upstream commit 6f56f6186c18e3fd54122b73da68e870687b8c59 ]

ovs_flow_key_update() is called when the flow key is invalid, and it is used to update and revalidate the flow key. Commit 329f45bc4f19 ("openvswitch: add mac_proto field to the flow key") introduces mac_proto field to flow key and use it to determine whether the flow key is valid. However, the commit does not update the code path in ovs_flow_key_update() to revalidate the flow key which may cause BUG_ON() on execute_recirc(). This patch addresses the aforementioned issue.

---
 net/openvswitch/flow.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

@@ -527,7 +527,7 @@ static int key_extract(struct sk_buff *s
 
 	/* Link layer. */
 	clear_vlan(key);
-	if (key->mac_proto == MAC_PROTO_NONE) {
+	if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) {
 		if (unlikely(eth_type_vlan(skb->protocol)))
 			return -EINVAL;
 

@@ -745,7 +745,13 @@ static int key_extract(struct sk_buff *s
 
 int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key)
 {
-	return key_extract(skb, key);
+	int res;
+
+	res = key_extract(skb, key);
+	if (!res)
+		key->mac_proto &= ~SW_FLOW_KEY_INVALID;
+
+	return res;
 }
 
 static int key_extract_mac_proto(struct sk_buff *skb)

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/openvswitch-fix-ovs_flow_key_update.patch