diff options
| author | Ido Schimmel <idosch@mellanox.com> | 2017-11-21 09:50:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-24 01:26:47 +0900 |
| commit | bbfcd77631573ac4a9f57eb6169e04256a111bc1 (patch) | |
| tree | c2652284123d238682df8993808cfda8f068112a /net/ipv6 | |
| parent | d7aa04a5e82b4f254d306926c81eae8df69e5200 (diff) | |
| download | op-kernel-dev-bbfcd77631573ac4a9f57eb6169e04256a111bc1.zip op-kernel-dev-bbfcd77631573ac4a9f57eb6169e04256a111bc1.tar.gz | |
ipv6: Do not consider linkdown nexthops during multipath
When the 'ignore_routes_with_linkdown' sysctl is set, we should not
consider linkdown nexthops during route lookup.
While the code correctly verifies that the initially selected route
('match') has a carrier, it does not perform the same check in the
subsequent multipath selection, resulting in a potential packet loss.
In case the chosen route does not have a carrier and the sysctl is set,
choose the initially selected route.
Fixes: 35103d11173b ("net: ipv6 sysctl option to ignore routes when nexthop link is down")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: David Ahern <dsahern@gmail.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 05eb7bc..0363db9 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -472,6 +472,11 @@ static struct rt6_info *rt6_multipath_select(struct rt6_info *match, &match->rt6i_siblings, rt6i_siblings) { route_choosen--; if (route_choosen == 0) { + struct inet6_dev *idev = sibling->rt6i_idev; + + if (!netif_carrier_ok(sibling->dst.dev) && + idev->cnf.ignore_routes_with_linkdown) + break; if (rt6_score_route(sibling, oif, strict) < 0) break; match = sibling; |
