summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMantas M <grawity@gmail.com>2016-12-16 10:30:59 +0200
committerJiri Slaby <jslaby@suse.cz>2017-05-09 08:19:30 +0200
commit180a602a952853b20275823e4a75170a078f6c75 (patch)
tree75d31d6afb38cd5723de3f1bdff3f76dc4b2c7cd
parentb078d30e957dc009370967eb208bbb7e7c586c81 (diff)
downloadlinux-180a602a952853b20275823e4a75170a078f6c75.tar.gz
linux-180a602a952853b20275823e4a75170a078f6c75.tar.bz2
linux-180a602a952853b20275823e4a75170a078f6c75.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>
-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 e19817a090c7..a4238c684a91 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1754,6 +1754,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);