net: core: add missing check for uid_range in rule_exists.
authorLorenzo Colitti <lorenzo@google.com>
Sun, 6 Nov 2016 15:16:25 +0000 (00:16 +0900)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2016 18:28:10 +0000 (13:28 -0500)
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>
net/core/fib_rules.c

index 5de436a73be254325d678735ee279331e96ef148..b6791d94841d56cf8b1027d3ba2d71dd21302caf 100644 (file)
@@ -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;