diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-26 01:39:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-27 10:33:05 +0900 |
| commit | 7c8f4e6dc30996bff806285730a0bb4e714d3d52 (patch) | |
| tree | a932270839a4134a2788b654500cdb3fe533c0cf | |
| parent | c809195f5523dd4d09403bbb1c9732d548aa0d1e (diff) | |
| download | linux-stable-7c8f4e6dc30996bff806285730a0bb4e714d3d52.tar.gz linux-stable-7c8f4e6dc30996bff806285730a0bb4e714d3d52.tar.bz2 linux-stable-7c8f4e6dc30996bff806285730a0bb4e714d3d52.zip | |
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: f9d4b0c1e969 ("fib_rules: move common handling of newrule delrule msgs into fib_nl2rule")
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/fib_rules.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 126ffc5bc630..bc8425d81022 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -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; |