提交 6b25d30b 编写于 作者: P Patrick McHardy 提交者: David S. Miller

[NET]: Fix gen_estimator timer removal race

As noticed by Jarek Poplawski <jarkao2@o2.pl>, 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: NPatrick McHardy <kaber@trash.net>
Acked-by: NJarek Poplawski <jarkao2@o2.pl>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 1498b3f1
...@@ -128,6 +128,7 @@ static void est_timer(unsigned long arg) ...@@ -128,6 +128,7 @@ static void est_timer(unsigned long arg)
spin_unlock(e->stats_lock); spin_unlock(e->stats_lock);
} }
if (elist[idx].list != NULL)
mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4)); mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
read_unlock(&est_lock); read_unlock(&est_lock);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册