renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

ipv6: Handle all fib6_nh in a nexthop in __ip6_route_redirect

Browse Source 
Add a hook in __ip6_route_redirect to handle a nexthop struct in a
fib6_info. Use nexthop_for_each_fib6_nh and fib6_nh_redirect_match
to call ip6_redirect_nh_match for each fib6_nh looking for a match.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-06-08 14:53:29 -07:00 committed by David S. Miller
parent e659ba31d8
commit c55c89884d
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/ipv6/route.c
View File

@ -2789,6 +2789,21 @@ static bool ip6_redirect_nh_match(const struct fib6_result *res,
return true; return true;
} }
struct fib6_nh_rd_arg {
struct fib6_result *res;
struct flowi6 *fl6;
const struct in6_addr *gw;
struct rt6_info **ret;
};
static int fib6_nh_redirect_match(struct fib6_nh *nh, void *_arg)
{
struct fib6_nh_rd_arg *arg = _arg;
arg->res->nh = nh;
return ip6_redirect_nh_match(arg->res, arg->fl6, arg->gw, arg->ret);
}
/* Handle redirects */ /* Handle redirects */
struct ip6rd_flowi { struct ip6rd_flowi {
struct flowi6 fl6; struct flowi6 fl6;
@ -2804,6 +2819,12 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,
struct ip6rd_flowi *rdfl = (struct ip6rd_flowi *)fl6; struct ip6rd_flowi *rdfl = (struct ip6rd_flowi *)fl6;
struct rt6_info *ret = NULL; struct rt6_info *ret = NULL;
struct fib6_result res = {}; struct fib6_result res = {};
struct fib6_nh_rd_arg arg = {
.res = &res,
.fl6 = fl6,
.gw = &rdfl->gateway,
.ret = &ret
};
struct fib6_info *rt; struct fib6_info *rt;
struct fib6_node *fn; struct fib6_node *fn;
@ -2828,14 +2849,24 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,
restart: restart:
for_each_fib6_node_rt_rcu(fn) { for_each_fib6_node_rt_rcu(fn) {
res.f6i = rt; res.f6i = rt;
res.nh = rt->fib6_nh;
if (fib6_check_expired(rt)) if (fib6_check_expired(rt))
continue; continue;
if (rt->fib6_flags & RTF_REJECT) if (rt->fib6_flags & RTF_REJECT)
break; break;
if (ip6_redirect_nh_match(&res, fl6, &rdfl->gateway, &ret)) if (unlikely(rt->nh)) {
goto out; if (nexthop_is_blackhole(rt->nh))
continue;
/* on match, res->nh is filled in and potentially ret */
if (nexthop_for_each_fib6_nh(rt->nh,
fib6_nh_redirect_match,
&arg))
goto out;
} else {
res.nh = rt->fib6_nh;
if (ip6_redirect_nh_match(&res, fl6, &rdfl->gateway,
&ret))
goto out;
}
} }
if (!rt) if (!rt)