ipmi_si_intf: Fix race in timer shutdown handling

smi_mod_timer() enables the timer before setting timer_running. This
means the timer can be running when we get to stop_timer_and_thread()
without timer_running having been set, resulting in del_timer_sync()
not being called and the timer being left to cause havoc during
shutdown.

Instead just call del_timer_sync() unconditionally

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Message-Id: <20190828203625.32093-2-Jes.Sorensen@gmail.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index d58253432a9a38f84046600f7fd4e29230f17b85..6b9a0593d2eb75efdbef280a4597efe72b0ea776 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1843,8 +1843,7 @@ static inline void stop_timer_and_thread(struct smi_info *smi_info)
        }
 
        smi_info->timer_can_start = false;
-       if (smi_info->timer_running)
-               del_timer_sync(&smi_info->si_timer);
+       del_timer_sync(&smi_info->si_timer);
 }
 
 static struct smi_info *find_dup_si(struct smi_info *info)