Commit 7c8f4e6d authored Jun 26, 2018 by Jason A. Donenfeld Committed by David S. Miller Jun 27, 2018

fib_rules: match rules based on suppress_* properties too



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 <Jason@zx2c4.com>
Fixes: f9d4b0c1 ("fib_rules: move common handling of newrule delrule msgs into fib_nl2rule")
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c809195f

net/core/fib_rules.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,14 @@ static struct fib_rule rule_find(struct fib_rules_ops ops,
		if (rule->mark && r->mark != rule->mark)
		continue;

		if (rule->suppress_ifgroup != -1 &&
		r->suppress_ifgroup != rule->suppress_ifgroup)
		continue;

		if (rule->suppress_prefixlen != -1 &&
		r->suppress_prefixlen != rule->suppress_prefixlen)
		continue;

		if (rule->mark_mask && r->mark_mask != rule->mark_mask)
		continue;

Admin message