Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1900fb5 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Really fix vti6 with oif in dst lookups 



6e28b000 ("net: Fix vti use case with oif in dst lookups for IPv6")
is missing the checks on FLOWI_FLAG_SKIP_NH_OIF. Add them.

Fixes: 42a7b32b ("xfrm: Add oif to dst lookups")
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Acked-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53387c4e

net/ipv6/ip6_output.c

+2 −1
Original line number Diff line number Diff line
@@ -877,7 +877,8 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, 
#ifdef CONFIG_IPV6_SUBTREES

	    ip6_rt_check(&rt->rt6i_src, &fl6->saddr, np->saddr_cache) ||

#endif

	    (fl6->flowi6_oif && fl6->flowi6_oif != dst->dev->ifindex)) {

	   (!(fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF) &&

	      (fl6->flowi6_oif && fl6->flowi6_oif != dst->dev->ifindex))) {

		dst_release(dst);

		dst = NULL;

	}

net/ipv6/route.c

+3 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,9 @@ static struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, 
	fn = fib6_lookup(&table->tb6_root, &fl6->daddr, &fl6->saddr);

	saved_fn = fn;



	if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF)

		oif = 0;



redo_rt6_select:

	rt = rt6_select(fn, oif, strict);

	if (rt->rt6i_nsiblings)