Skip to content

Commit 44540ea

Browse files
libin2015gregkh
authored andcommitted
workqueue: Fix NULL pointer dereference
commit cef572ad9bd7f85035ba8272e5352040e8be0152 upstream. 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: 8d03ecf ("workqueue: reimplement is_chained_work() using current_wq_worker()") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ad8c619 commit 44540ea

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/workqueue_internal.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <linux/workqueue.h>
1111
#include <linux/kthread.h>
12+
#include <linux/preempt.h>
1213

1314
struct worker_pool;
1415

@@ -59,7 +60,7 @@ struct worker {
5960
*/
6061
static inline struct worker *current_wq_worker(void)
6162
{
62-
if (current->flags & PF_WQ_WORKER)
63+
if (in_task() && (current->flags & PF_WQ_WORKER))
6364
return kthread_data(current);
6465
return NULL;
6566
}

0 commit comments

Comments
 (0)