[net] net/openvswitch: Set the ipv6 source tunnel key address attribute correctly

Submitted by Or Gerlitz on March 15, 2017, 4:10 p.m.

Details

Message ID 1489594247-8601-1-git-send-email-ogerlitz@mellanox.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Or Gerlitz March 15, 2017, 4:10 p.m.
When dealing with ipv6 source tunnel key address attribute
(OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel
dst ip, fix that.

Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling')
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reported-by: Paul Blakey <paulb@mellanox.com>
---

Jiri, so I have few wild guesses how things work w.o this fix, e.g: 

(1) typically the tunnel source ip attribute isn't set by user-space
(2) the vxlan driver overrides the source ip from what they get after 
    route lookup on the dest
(3) more?

 net/openvswitch/flow_netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Benc March 15, 2017, 4:28 p.m.
On Wed, 15 Mar 2017 18:10:47 +0200, Or Gerlitz wrote:
> When dealing with ipv6 source tunnel key address attribute
> (OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel
> dst ip, fix that.
> 
> Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling')
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> Reported-by: Paul Blakey <paulb@mellanox.com>

Acked-by: Jiri Benc <jbenc@redhat.com>

> Jiri, so I have few wild guesses how things work w.o this fix, e.g: 
> 
> (1) typically the tunnel source ip attribute isn't set by user-space

I think this is it.

Thanks for the fix!

 Jiri
Joe Stringer March 15, 2017, 5:41 p.m.
On 15 March 2017 at 09:28, Jiri Benc <jbenc@redhat.com> wrote:
> On Wed, 15 Mar 2017 18:10:47 +0200, Or Gerlitz wrote:
>> When dealing with ipv6 source tunnel key address attribute
>> (OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel
>> dst ip, fix that.
>>
>> Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling')
>> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
>> Reported-by: Paul Blakey <paulb@mellanox.com>
>
> Acked-by: Jiri Benc <jbenc@redhat.com>

Thanks, good spotting.

Acked-by: Joe Stringer <joe@ovn.org>
David Miller March 15, 2017, 10:11 p.m.
From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Wed, 15 Mar 2017 18:10:47 +0200

> When dealing with ipv6 source tunnel key address attribute
> (OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel
> dst ip, fix that.
> 
> Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling')
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> Reported-by: Paul Blakey <paulb@mellanox.com>

Applied and queued up for -stable, thanks!

Patch hide | download patch | download mbox

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 6f5fa50..a08ff83 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -604,7 +604,7 @@  static int ip_tun_from_nlattr(const struct nlattr *attr,
 			ipv4 = true;
 			break;
 		case OVS_TUNNEL_KEY_ATTR_IPV6_SRC:
-			SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.dst,
+			SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.src,
 					nla_get_in6_addr(a), is_mask);
 			ipv6 = true;
 			break;