| Message ID | 1445268365-23414-1-git-send-email-dsa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Oct 19, 2015 at 08:26:05AM -0700, David Ahern wrote: > 6e28b000825d ("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: 42a7b32b73d6 ("xfrm: Add oif to dst lookups") > Cc: Steffen Klassert <steffen.klassert@secunet.com> > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> > --- > This is needed for net in 4.3. 6e28b000825d was mistakenly created on > top of the VRF patches which had this change. Steffen has confirmed > VTI6 works with this change. Acked-by: Steffen Klassert <steffen.klassert@secunet.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Ahern <dsa@cumulusnetworks.com> Date: Mon, 19 Oct 2015 08:26:05 -0700 > 6e28b000825d ("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: 42a7b32b73d6 ("xfrm: Add oif to dst lookups") > Cc: Steffen Klassert <steffen.klassert@secunet.com> > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 61d403ee1031..d03d6da772f3 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -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; } diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 968f31c01f89..be5d2879b5d8 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -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)
6e28b000825d ("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: 42a7b32b73d6 ("xfrm: Add oif to dst lookups") Cc: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: David Ahern <dsa@cumulusnetworks.com> --- This is needed for net in 4.3. 6e28b000825d was mistakenly created on top of the VRF patches which had this change. Steffen has confirmed VTI6 works with this change. net/ipv6/ip6_output.c | 3 ++- net/ipv6/route.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)