From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jason A. Donenfeld" Subject: [PATCH] fib_rules: match rules based on suppress_* properties too Date: Sat, 23 Jun 2018 17:59:30 +0200 Message-ID: <20180623155930.25983-1-Jason@zx2c4.com> References: Cc: "Jason A. Donenfeld" To: roopa@cumulusnetworks.com, Netdev Return-path: Received: from frisell.zx2c4.com ([192.95.5.64]:59347 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbeFWP7h (ORCPT ); Sat, 23 Jun 2018 11:59:37 -0400 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: Two rules with different values of suppress_prefix or suppress_ifgroup are not the same. This fixes an -EEXIST when running: $ ip -4 rule add table main suppress_prefixlength 0 Signed-off-by: Jason A. Donenfeld Fixes: f9d4b0c1e969 ("fib_rules: move common handling of newrule delrule msgs into fib_nl2rule") --- net/core/fib_rules.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 126ffc5bc630..665799311b98 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -416,6 +416,12 @@ static struct fib_rule *rule_find(struct fib_rules_ops *ops, if (rule->mark && r->mark != rule->mark) continue; + if (r->suppress_ifgroup != rule->suppress_ifgroup) + continue; + + if (r->suppress_prefixlen != rule->suppress_prefixlen) + continue; + if (rule->mark_mask && r->mark_mask != rule->mark_mask) continue; -- 2.17.1