Skip to contentSkip to conversation

Patch "workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Dec 14, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
workqueue-trigger-warn-if-queue_delayed_work-is-called-with-null-wq.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Dec 14 21:30:47 CET 2017

From: Tejun Heo <[email protected]>
Date: Mon, 6 Mar 2017 15:33:42 -0500
Subject: workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq

From: Tejun Heo <[email protected]>

[ Upstream commit 637fdbae60d6cb9f6e963c1079d7e0445c86ff7d ]

If queue_delayed_work() gets called with NULL @wq, the kernel will oops asynchronuosly on timer expiration which isn't too helpful in tracking down the offender. This actually happened with smc.

__queue_delayed_work() already does several input sanity checks synchronously. Add NULL @wq check.

---
 kernel/workqueue.c |    1 +
 1 file changed, 1 insertion(+)
kernel/workqueue.c +1 -0
@@ -1452,6 +1452,7 @@ static void __queue_delayed_work(int cpu
 	struct timer_list *timer = &dwork->timer;
 	struct work_struct *work = &dwork->work;
 
+	WARN_ON_ONCE(!wq);
 	WARN_ON_ONCE(timer->function != delayed_work_timer_fn ||
 		     timer->data != (unsigned long)dwork);
 	WARN_ON_ONCE(timer_pending(timer));

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/libata-drop-warn-from-protocol-error-in-ata_sff_qc_issue.patch queue-3.18/workqueue-trigger-warn-if-queue_delayed_work-is-called-with-null-wq.patch