From: Greg Kroah-Hartman Date: Wed, 19 Apr 2017 13:05:47 +0000 (+0200) Subject: more 3.18 patches X-Git-Tag: v4.4.63~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfc1ee6fcf6a1cab01ba0c14df495f167c3e6d1b;p=thirdparty%2Fkernel%2Fstable-queue.git more 3.18 patches --- diff --git a/queue-3.18/net-ipv6-check-route-protocol-when-deleting-routes.patch b/queue-3.18/net-ipv6-check-route-protocol-when-deleting-routes.patch new file mode 100644 index 00000000000..83e23666c39 --- /dev/null +++ b/queue-3.18/net-ipv6-check-route-protocol-when-deleting-routes.patch @@ -0,0 +1,38 @@ +From c2ed1880fd61a998e3ce40254a99a2ad000f1a7d Mon Sep 17 00:00:00 2001 +From: Mantas M +Date: Fri, 16 Dec 2016 10:30:59 +0200 +Subject: net: ipv6: check route protocol when deleting routes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mantas M + +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 proto something`. + +Signed-off-by: Mantas Mikulėnas +Signed-off-by: David S. Miller +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv6/route.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -1731,6 +1731,8 @@ static int ip6_route_del(struct fib6_con + 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); + diff --git a/queue-3.18/series b/queue-3.18/series index 00f9bb71183..d1703d83b0e 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -61,3 +61,4 @@ pegasus-use-heap-buffers-for-all-register-access.patch rtl8150-use-heap-buffers-for-all-register-access.patch catc-combine-failure-cleanup-code-in-catc_probe.patch catc-use-heap-buffer-for-memory-size-test.patch +net-ipv6-check-route-protocol-when-deleting-routes.patch