Commit f9d4850a authored Oct 11, 2016 by Vadim Fedorenko Committed by Greg Kroah-Hartman Nov 15, 2016

ip6_tunnel: fix ip6_tnl_lookup



[ Upstream commit 68d00f332e0ba7f60f212be74ede290c9f873bc5 ]

The commit ea3dc960 ("ip6_tunnel: Add support for wildcard tunnel
endpoints.") introduces support for wildcards in tunnels endpoints,
but in some rare circumstances ip6_tnl_lookup selects wrong tunnel
interface relying only on source or destination address of the packet
and not checking presence of wildcard in tunnels endpoints. Later in
ip6_tnl_rcv this packets can be dicarded because of difference in
ipproto even if fallback device have proper ipproto configuration.

This patch adds checks of wildcard endpoint in tunnel avoiding such
behavior

Fixes: ea3dc960 ("ip6_tunnel: Add support for wildcard tunnel endpoints.")
Signed-off-by: Vadim Fedorenko <junk@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 705b5aca

net/ipv6/ip6_tunnel.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ ip6_tnl_lookup(struct net net, const struct in6_addr remote, const struct in6_
		hash = HASH(&any, local);
		for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
		if (ipv6_addr_equal(local, &t->parms.laddr) &&
		ipv6_addr_any(&t->parms.raddr) &&
		(t->dev->flags & IFF_UP))
		return t;
		}
		@@ -253,6 +254,7 @@ ip6_tnl_lookup(struct net net, const struct in6_addr remote, const struct in6_
		hash = HASH(remote, &any);
		for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) {
		if (ipv6_addr_equal(remote, &t->parms.raddr) &&
		ipv6_addr_any(&t->parms.laddr) &&
		(t->dev->flags & IFF_UP))
		return t;
		}