From: Tejun Heo Date: Mon, 6 Mar 2017 20:33:42 +0000 (-0500) Subject: workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq X-Git-Tag: v4.14-rc1~1293^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=637fdbae60d6cb9f6e963c1079d7e0445c86ff7d;p=platform%2Fkernel%2Flinux-rpi.git workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq 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: Dave Jones Link: http://lkml.kernel.org/r/20170227171439.jshx3qplflyrgcv7@codemonkey.org.uk Signed-off-by: Tejun Heo --- diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 072cbc9..c0168b7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1507,6 +1507,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));