diff options
author | Li Bin <huawei.libin@huawei.com> | 2017-10-27 23:07:28 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2017-10-30 10:56:01 -0400 |
commit | cef572ad9bd7f85035ba8272e5352040e8be0152 (patch) | |
tree | a324f1e505d3698cd0df3d22898f1c5c5e68370d /kernel | |
parent | 692b48258dda7c302e777d7d5f4217244478f1f6 (diff) |
workqueue: Fix NULL pointer dereference
When queue_work() is used in irq (not in task context), there is
a potential case that trigger NULL pointer dereference.
----------------------------------------------------------------
worker_thread()
|-spin_lock_irq()
|-process_one_work()
|-worker->current_pwq = pwq
|-spin_unlock_irq()
|-worker->current_func(work)
|-spin_lock_irq()
|-worker->current_pwq = NULL
|-spin_unlock_irq()
//interrupt here
|-irq_handler
|-__queue_work()
//assuming that the wq is draining
|-is_chained_work(wq)
|-current_wq_worker()
//Here, 'current' is the interrupted worker!
|-current->current_pwq is NULL here!
|-schedule()
----------------------------------------------------------------
Avoid it by checking for task context in current_wq_worker(), and
if not in task context, we shouldn't use the 'current' to check the
condition.
Reported-by: Xiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: Li Bin <huawei.libin@huawei.com>
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 8d03ecfe4718 ("workqueue: reimplement is_chained_work() using current_wq_worker()")
Cc: stable@vger.kernel.org # v3.9+
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/workqueue_internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h index 8635417c587b..29fa81f0f51a 100644 --- a/kernel/workqueue_internal.h +++ b/kernel/workqueue_internal.h | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <linux/workqueue.h> | 10 | #include <linux/workqueue.h> |
11 | #include <linux/kthread.h> | 11 | #include <linux/kthread.h> |
12 | #include <linux/preempt.h> | ||
12 | 13 | ||
13 | struct worker_pool; | 14 | struct worker_pool; |
14 | 15 | ||
@@ -59,7 +60,7 @@ struct worker { | |||
59 | */ | 60 | */ |
60 | static inline struct worker *current_wq_worker(void) | 61 | static inline struct worker *current_wq_worker(void) |
61 | { | 62 | { |
62 | if (current->flags & PF_WQ_WORKER) | 63 | if (in_task() && (current->flags & PF_WQ_WORKER)) |
63 | return kthread_data(current); | 64 | return kthread_data(current); |
64 | return NULL; | 65 | return NULL; |
65 | } | 66 | } |