Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3366c0d3 authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman
Browse files

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




[ 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.

Reported-by: default avatarDave Jones <davej@codemonkey.org.uk>
Link: http://lkml.kernel.org/r/20170227171439.jshx3qplflyrgcv7@codemonkey.org.uk


Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b79fa3b

kernel/workqueue.c

+1 −0
Original line number Diff line number Diff line
@@ -1452,6 +1452,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, 
	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));