diff options
| author | Simon Horman <simon.horman@netronome.com> | 2015-12-18 13:43:15 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-31 22:25:49 +0300 |
| commit | 970106278dd0bc4403dc79ce18349e7383f087da (patch) | |
| tree | 597f15263f94d26abc4d501b9c1783c06066abe2 /net | |
| parent | 1c3e006c2a46355572b37e0fe075c5b89158f99a (diff) | |
| download | linux-970106278dd0bc4403dc79ce18349e7383f087da.tar.xz | |
openvswitch: correct encoding of set tunnel action attributes
[ 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 38536c137c54..45635118cc86 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -2382,7 +2382,9 @@ static int set_action_to_attr(const struct nlattr *a, struct sk_buff *skb) 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); |