net_sched: gen_estimator: fix lockdep splat

commit 40ca54e3a686f13117f3de0c443f8026dadf7c44 upstream.

syzbot reported a lockdep splat in gen_new_estimator() /
est_fetch_counters() when attempting to lock est->stats_lock.

Since est_fetch_counters() is called from BH context from timer
interrupt, we need to block BH as well when calling it from process
context.

Most qdiscs use per cpu counters and are immune to the problem,
but net/sched/act_api.c and net/netfilter/xt_RATEEST.c are using
a spinlock to protect their data. They both call gen_new_estimator()
while object is created and not yet alive, so this bug could
not trigger a deadlock, only a lockdep splat.

Fixes: 1c0d32fde5bd ("net_sched: gen_estimator: complete rewrite of rate estimators")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 7c1ffd6f950172c1915d8e5fa2b5e3f77e4f4c78..00ecec4891f3835c7512e93f0b8551fe6f0095a1 100644 (file)
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -159,7 +159,11 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
        est->intvl_log = intvl_log;
        est->cpu_bstats = cpu_bstats;
 
+       if (stats_lock)
+               local_bh_disable();
        est_fetch_counters(est, &b);
+       if (stats_lock)
+               local_bh_enable();
        est->last_bytes = b.bytes;
        est->last_packets = b.packets;
        old = rcu_dereference_protected(*rate_est, 1);