From e5e0ad360edc354c661ef2ab49d42ae964fc46f7 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sun, 22 Jul 2007 18:26:20 +0200 Subject: [PATCH] [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 Signed-off-by: Adrian Bunk --- net/core/gen_estimator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c index b07c029e8219..5af93535e2aa 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<