diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-07 02:24:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-07 02:24:23 +0200 |
| commit | 602042bf29f6efde39cfb5fdd9289bf4854bc0c5 (patch) | |
| tree | 9d1056524921544d2359e81c6a6697e62e8373ad /kernel | |
| parent | 0d32b3ec5f902bf40d03db08837f3eafbb6a4577 (diff) | |
| parent | 980db94e3eeefdd8a1c46f86412c33a7f7806f51 (diff) | |
Merge tag 'wq-for-7.3-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo:
- Fix a NULL dereference in the chained work check when a kworker
queues work on a draining or destroying workqueue outside work item
execution.
* tag 'wq-for-7.3-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: Fix NULL current_pwq deref in chained work check
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 959525393739..c56c042d1c35 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2290,7 +2290,7 @@ static bool is_chained_work(struct workqueue_struct *wq) * Return %true iff I'm a worker executing a work item on @wq. If * I'm @worker, it's safe to dereference it without locking. */ - return worker && worker->current_pwq->wq == wq; + return worker && worker->current_pwq && worker->current_pwq->wq == wq; } /* |