From 60642e4fa9b53edbc924ebc22aadbc7696b57407 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Mon, 21 Dec 2015 14:57:36 -0800 Subject: [PATCH] datapath: Backport: openvswitch: Fix serialization of non-masked set actions. I found this missing commit while checking diff against upstream OVS. Upstream Commit msg: Set actions consist of a regular OVS_KEY_ATTR_* attribute nested inside of a OVS_ACTION_ATTR_SET action attribute. When converting masked actions back to regular set actions, the inner attribute length was not changed, ie, double the length being serialized. This patch fixes the bug. Fixes: 83d2b9b ("net: openvswitch: Support masked set actions.") Signed-off-by: Joe Stringer Acked-by: Jarno Rajahalme Signed-off-by: David S. Miller Upstream: f4f8e738505 ("openvswitch: Fix serialization of non-masked set actions") Signed-off-by: Pravin B Shelar Acked-by: Joe Stringer --- datapath/flow_netlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 8df5c69b5..6ffcc53ea 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -2412,14 +2412,20 @@ static int masked_set_action_to_set_action_attr(const struct nlattr *a, struct sk_buff *skb) { const struct nlattr *ovs_key = nla_data(a); + struct nlattr *nla; size_t key_len = nla_len(ovs_key) / 2; /* Revert the conversion we did from a non-masked set action to * masked set action. */ - if (nla_put(skb, OVS_ACTION_ATTR_SET, nla_len(a) - key_len, ovs_key)) + nla = nla_nest_start(skb, OVS_ACTION_ATTR_SET); + if (!nla) return -EMSGSIZE; + if (nla_put(skb, nla_type(ovs_key), key_len, nla_data(ovs_key))) + return -EMSGSIZE; + + nla_nest_end(skb, nla); return 0; } -- 2.20.1