summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMantas M <grawity@gmail.com>2016-12-16 10:30:59 +0200
committerWilly Tarreau <w@1wt.eu>2017-06-20 14:04:47 +0200
commit3fa16561f160d629f79321616a3e0dab5434e8d3 (patch)
tree6699357cf3f59d2d1821259c56174d50c68dc161 /net
parent6b7c152578ab00cdb7da05481dafb4a99b1a316d (diff)
downloadlinux-3fa16561f160d629f79321616a3e0dab5434e8d3.tar.gz
linux-3fa16561f160d629f79321616a3e0dab5434e8d3.tar.bz2
linux-3fa16561f160d629f79321616a3e0dab5434e8d3.zip
net: ipv6: check route protocol when deleting routes
commit c2ed1880fd61a998e3ce40254a99a2ad000f1a7d upstream. The protocol field is checked when deleting IPv4 routes, but ignored for IPv6, which causes problems with routing daemons accidentally deleting externally set routes (observed by multiple bird6 users). This can be verified using `ip -6 route del <prefix> proto something`. Signed-off-by: Mantas Mikulėnas <grawity@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/route.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fb5010c27a22..244892ce560e 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1676,6 +1676,8 @@ static int ip6_route_del(struct fib6_config *cfg)
continue;
if (cfg->fc_metric && cfg->fc_metric != rt->rt6i_metric)
continue;
+ if (cfg->fc_protocol && cfg->fc_protocol != rt->rt6i_protocol)
+ continue;
dst_hold(&rt->dst);
read_unlock_bh(&table->tb6_lock);