Skip to content

Commit 6993d0f

Browse files
Zqiang1211torvalds
authored andcommitted
kthread_worker: prevent queuing delayed work from timer_fn when it is being canceled
There is a small race window when a delayed work is being canceled and the work still might be queued from the timer_fn: CPU0 CPU1 kthread_cancel_delayed_work_sync() __kthread_cancel_work_sync() __kthread_cancel_work() work->canceling++; kthread_delayed_work_timer_fn() kthread_insert_work(); BUG: kthread_insert_work() should not get called when work->canceling is set. Signed-off-by: Zqiang <qiang.zhang@windriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Petr Mladek <pmladek@suse.com> Acked-by: Tejun Heo <tj@kernel.org> Cc: <stable@vger.kernel.org> Link: https://lkml.kernel.org/r/20201014083030.16895-1-qiang.zhang@windriver.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent a77eedb commit 6993d0f

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/kthread.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,8 @@ void kthread_delayed_work_timer_fn(struct timer_list *t)
897897
/* Move the work from worker->delayed_work_list. */
898898
WARN_ON_ONCE(list_empty(&work->node));
899899
list_del_init(&work->node);
900-
kthread_insert_work(worker, work, &worker->work_list);
900+
if (!work->canceling)
901+
kthread_insert_work(worker, work, &worker->work_list);
901902

902903
raw_spin_unlock_irqrestore(&worker->lock, flags);
903904
}

0 commit comments

Comments
 (0)