ipv6: Fix redirect with VRF

[ Upstream commit 31680ac265802397937d75461a2809a067b9fb93 ]

IPv6 redirect is broken for VRF. __ip6_route_redirect walks the FIB
entries looking for an exact match on ifindex. With VRF the flowi6_oif
is updated by l3mdev_update_flow to the l3mdev index and the
FLOWI_FLAG_SKIP_NH_OIF set in the flags to tell the lookup to skip the
device match. For redirects the device match is requires so use that
flag to know when the oif needs to be reset to the skb device index.

Fixes: ca254490c8df ("net: Add VRF support to IPv6 stack")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e470589fb93b249b024d74624bbea88e9d59f408..ab348489bd8a66781f88c7e4d7e36baaa771339a 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2442,6 +2442,12 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,
        struct fib6_info *rt;
        struct fib6_node *fn;
 
+       /* l3mdev_update_flow overrides oif if the device is enslaved; in
+        * this case we must match on the real ingress device, so reset it
+        */
+       if (fl6->flowi6_flags & FLOWI_FLAG_SKIP_NH_OIF)
+               fl6->flowi6_oif = skb->dev->ifindex;
+
        /* Get the "current" route for this destination and
         * check if the redirect has come from appropriate router.
         *