path: root/net/ipv6/route.c
diff options
authorStefano Brivio <sbrivio@redhat.com>2019-06-21 17:45:25 +0200
committerDavid S. Miller <davem@davemloft.net>2019-06-24 10:18:49 -0700
commit3401bfb1638efdd0b721d03c51c48171a0cde8c6 (patch)
tree8bc561fc73f4cd6e3d29c5dd617390cdaf7944a9 /net/ipv6/route.c
parentRevert "net/ipv6: Bail early if user only wants cloned entries" (diff)
ipv6/route: Don't match on fc_nh_id if not set in ip6_route_del()
If fc_nh_id isn't set, we shouldn't try to match against it. This actually matters just for the RTF_CACHE below (where this case is already handled): if iproute2 gets a route exception and tries to delete it, it won't reference it by fc_nh_id, even if a nexthop object might be associated to the originating route. Fixes: 5b98324ebe29 ("ipv6: Allow routes to use nexthop objects") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 3975ae8e2440..0a7c21ac0b95 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3840,7 +3840,8 @@ static int ip6_route_del(struct fib6_config *cfg,
for_each_fib6_node_rt_rcu(fn) {
struct fib6_nh *nh;
- if (rt->nh && rt->nh->id != cfg->fc_nh_id)
+ if (rt->nh && cfg->fc_nh_id &&
+ rt->nh->id != cfg->fc_nh_id)
if (cfg->fc_flags & RTF_CACHE) {