Commit 4a0ae7b0 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by David S. Miller

mISDN: fix race in timer canceling on module unloading

Using timer_pending() without additional syncronization is racy,
del_timer_sync() must be used here for waiting in-flight handler.
Bug caught with help from "debug-objects" during random insmod/rmmod.
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4008e97f
...@@ -1217,8 +1217,7 @@ static void __exit dsp_cleanup(void) ...@@ -1217,8 +1217,7 @@ static void __exit dsp_cleanup(void)
{ {
mISDN_unregister_Bprotocol(&DSP); mISDN_unregister_Bprotocol(&DSP);
if (timer_pending(&dsp_spl_tl)) del_timer_sync(&dsp_spl_tl);
del_timer(&dsp_spl_tl);
if (!list_empty(&dsp_ilist)) { if (!list_empty(&dsp_ilist)) {
printk(KERN_ERR "mISDN_dsp: Audio DSP object inst list not " printk(KERN_ERR "mISDN_dsp: Audio DSP object inst list not "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment