Commit e4880bc5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-4.14-fixes' of git://

Pull workqueue fix from Tejun Heo:
 "Another fix for a really old bug.

  It only affects drain_workqueue() which isn't used often and even then
  triggers only during a pretty small race window, so it isn't too
  surprising that it stayed hidden for so long.

  The fix is straight-forward and low-risk. Kudos to Li Bin for
  reporting and fixing the bug"

* 'for-4.14-fixes' of git://
  workqueue: Fix NULL pointer dereference
parents 136fc5c4 cef572ad
......@@ -10,6 +10,7 @@
#include <linux/workqueue.h>
#include <linux/kthread.h>
#include <linux/preempt.h>
struct worker_pool;
......@@ -60,7 +61,7 @@ struct worker {
static inline struct worker *current_wq_worker(void)
if (current->flags & PF_WQ_WORKER)
if (in_task() && (current->flags & PF_WQ_WORKER))
return kthread_data(current);
return NULL;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment