Skip to contentSkip to conversation

Patch "openvswitch: correct encoding of set tunnel action attributes" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Jan 27, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

openvswitch: correct encoding of set tunnel action attributes

to the 4.3-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-correct-encoding-of-set-tunnel-action-attributes.patch
and it can be found in the queue-4.3 subdirectory.

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

Quoted 1 line

From foo@baz Tue Jan 26 21:35:02 PST 2016

From: Simon Horman <[email protected]>
Date: Fri, 18 Dec 2015 19:43:15 +0900
Subject: openvswitch: correct encoding of set tunnel action attributes

From: Simon Horman <[email protected]>

[ Upstream commit e905eabc90a5b787d8708df164543ee295bea5f2 ]

In a set action tunnel attributes should be encoded in a nested action.

I noticed this because ovs-dpctl was reporting an error when dumping flows due to the incorrect encoding of tunnel attributes in a set action.

Fixes fc4099f17240 ("openvswitch: Fix egress tunnel info.")
---
 net/openvswitch/flow_netlink.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/openvswitch/flow_netlink.c +3 -1
@@ -2382,7 +2382,9 @@ static int set_action_to_attr(const stru
 		if (!start)
 			return -EMSGSIZE;
 
-		err = ovs_nla_put_tunnel_info(skb, tun_info);
+		err =  ipv4_tun_to_nlattr(skb, &tun_info->key,
+					  ip_tunnel_info_opts(tun_info),
+					  tun_info->options_len);
 		if (err)
 			return err;
 		nla_nest_end(skb, start);

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

queue-4.3/openvswitch-correct-encoding-of-set-tunnel-action-attributes.patch