diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-11-07 00:16:25 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-09 13:28:10 -0500 |
| commit | 35b80733b3d3ab620edc30f286606be775930843 (patch) | |
| tree | 51050711a9fc2da7b58882e0631836f5b6b882b7 | |
| parent | bb48024284327768debd03a197d7c4179ec6ca05 (diff) | |
| download | net-next-35b80733b3d3ab620edc30f286606be775930843.tar.gz | |
net: core: add missing check for uid_range in rule_exists.
Without this check, it is not possible to create two rules that
are identical except for their UID ranges. For example:
root@net-test:/# ip rule add prio 1000 lookup 300
root@net-test:/# ip rule add prio 1000 uidrange 100-200 lookup 300
RTNETLINK answers: File exists
root@net-test:/# ip rule add prio 1000 uidrange 100-199 lookup 100
root@net-test:/# ip rule add prio 1000 uidrange 200-299 lookup 200
root@net-test:/# ip rule add prio 1000 uidrange 300-399 lookup 100
RTNETLINK answers: File exists
Tested: https://android-review.googlesource.com/#/c/299980/
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/fib_rules.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 5de436a73be254..b6791d94841d56 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -343,6 +343,10 @@ static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh, if (r->l3mdev != rule->l3mdev) continue; + if (!uid_eq(r->uid_range.start, rule->uid_range.start) || + !uid_eq(r->uid_range.end, rule->uid_range.end)) + continue; + if (!ops->compare(r, frh, tb)) continue; return 1; |