Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbdFSTMC (ORCPT + 2 others); Mon, 19 Jun 2017 15:12:02 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:52353 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753407AbdFSSgi (ORCPT ); Mon, 19 Jun 2017 14:36:38 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Mantas M , "David S . Miller" , Ben Hutchings , Jiri Slaby , Willy Tarreau Subject: [PATCH 3.10 242/268] net: ipv6: check route protocol when deleting routes Date: Mon, 19 Jun 2017 20:32:21 +0200 Message-Id: <1497897167-14556-243-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=latin1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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: Jiri Slaby Signed-off-by: Willy Tarreau --- net/ipv6/route.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index fb5010c..244892c 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); -- 2.8.0.rc2.1.gbe9624a