From: Patrick McHardy Date: Mon, 9 Jul 2007 22:30:19 +0000 (-0700) Subject: [NET]: Fix gen_estimator timer removal race X-Git-Tag: v2.6.23-rc1~1109^2~26 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6b25d30bf112370a12d05c3c0fd43732985dab01;p=linux-2.6-omap-h63xx.git [NET]: Fix gen_estimator timer removal race As noticed by Jarek Poplawski , the timer removal in gen_kill_estimator races with the timer function rearming the timer. Check whether the timer list is empty before rearming the timer in the timer function to fix this. Signed-off-by: Patrick McHardy Acked-by: Jarek Poplawski Signed-off-by: David S. Miller --- diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c index 17daf4c9f79..cc84d8d8a3c 100644 --- a/net/core/gen_estimator.c +++ b/net/core/gen_estimator.c @@ -128,7 +128,8 @@ static void est_timer(unsigned long arg) spin_unlock(e->stats_lock); } - mod_timer(&elist[idx].timer, jiffies + ((HZ<