diff options
| author | Tejun Heo <tj@kernel.org> | 2017-03-06 15:33:42 -0500 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-01-17 12:55:25 -0500 |
| commit | 6b4d70f553acd2203608eb27858dba88ad68b691 (patch) | |
| tree | bcd08276d5135c488a1bc3af46d4b7d638d23344 /kernel | |
| parent | af0e7947de8c4b80e55ebd8bf96b6d795eca9cc3 (diff) | |
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: Dave Jones <davej@codemonkey.org.uk>
Link: http://lkml.kernel.org/r/20170227171439.jshx3qplflyrgcv7@codemonkey.org.uk
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 791f6ebc84a3..376db986db9b 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1484,6 +1484,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)); |