ipv6: Handle all fib6_nh in a nexthop in rt6_do_redirect

Use nexthop_for_each_fib6_nh and fib6_nh_find_match to find the
fib6_nh in a nexthop that correlates to the device and gateway
in the rt6_info.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 06498f6..715356e 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3899,7 +3899,25 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
        if (!res.f6i)
                goto out;
 
-       res.nh = res.f6i->fib6_nh;
+       if (res.f6i->nh) {
+               struct fib6_nh_match_arg arg = {
+                       .dev = dst->dev,
+                       .gw = &rt->rt6i_gateway,
+               };
+
+               nexthop_for_each_fib6_nh(res.f6i->nh,
+                                        fib6_nh_find_match, &arg);
+
+               /* fib6_info uses a nexthop that does not have fib6_nh
+                * using the dst->dev. Should be impossible
+                */
+               if (!arg.match)
+                       goto out;
+               res.nh = arg.match;
+       } else {
+               res.nh = res.f6i->fib6_nh;
+       }
+
        res.fib6_flags = res.f6i->fib6_flags;
        res.fib6_type = res.f6i->fib6_type;
        nrt = ip6_rt_cache_alloc(&res, &msg->dest, NULL);