]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ipv6: check route protocol when deleting routes
authorMantas M <grawity@gmail.com>
Fri, 16 Dec 2016 08:30:59 +0000 (10:30 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 9 May 2017 06:19:30 +0000 (08:19 +0200)
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>
net/ipv6/route.c

index e19817a090c79df48a007dbdfd4cf9aba0be01ff..a4238c684a91f86d071b89039a203a3b143a4959 100644 (file)
@@ -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);