| From foo@baz Tue Jan 26 21:35:02 PST 2016 |
| From: Simon Horman <simon.horman@netronome.com> |
| Date: Fri, 18 Dec 2015 19:43:15 +0900 |
| Subject: openvswitch: correct encoding of set tunnel action attributes |
| |
| From: Simon Horman <simon.horman@netronome.com> |
| |
| [ 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.") |
| Signed-off-by: Simon Horman <simon.horman@netronome.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/openvswitch/flow_netlink.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/net/openvswitch/flow_netlink.c |
| +++ b/net/openvswitch/flow_netlink.c |
| @@ -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); |
