]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
fib: use atomic_inc_not_zero() in fib_rules_lookup
authorEric Dumazet <eric.dumazet@gmail.com>
Mon, 27 Sep 2010 04:18:27 +0000 (04:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Sep 2010 04:30:44 +0000 (21:30 -0700)
It seems we dont use appropriate refcount increment in an
rcu_read_lock() protected section.

fib_rule_get() might increment a null refcount and bad things could
happen.

While fib_nl_delrule() respects an rcu grace period before calling
fib_rule_put(), fib_rules_cleanup_ops() calls fib_rule_put() without a
grace period.

Note : after this patch, we might avoid the synchronize_rcu() call done
in fib_nl_delrule()

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/fib_rules.c

index 42e84e08a1becd4b64a65a74758bf4e13783a8ae..d0787284cb07ed3a2cc03e738b2509666c2d7f1a 100644 (file)
@@ -225,9 +225,11 @@ jumped:
                        err = ops->action(rule, fl, flags, arg);
 
                if (err != -EAGAIN) {
-                       fib_rule_get(rule);
-                       arg->rule = rule;
-                       goto out;
+                       if (likely(atomic_inc_not_zero(&rule->refcnt))) {
+                               arg->rule = rule;
+                               goto out;
+                       }
+                       break;
                }
        }