UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

io_uring: ensure consistent view of original task ->mm from SQPOLL 

Ensure we get a valid view of the task mm, by using task_lock() when
attempting to grab the original task mm.

Reported-by: syzbot+b57abf7ee60829090495@syzkaller.appspotmail.com
Fixes: 2aede0e417 ("io_uring: stash ctx task reference for SQPOLL")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2020-11-02 10:39:05 -07:00
parent fdaf083cdf
commit 4b70cf9dea
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/io_uring.c
View File

@ -995,20 +995,33 @@ static void io_sq_thread_drop_mm(void)
if (mm) { if (mm) {
kthread_unuse_mm(mm); kthread_unuse_mm(mm);
mmput(mm); mmput(mm);
current->mm = NULL;
} }
} }
static int __io_sq_thread_acquire_mm(struct io_ring_ctx *ctx) static int __io_sq_thread_acquire_mm(struct io_ring_ctx *ctx)
{ {
if (!current->mm) { struct mm_struct *mm;
if (unlikely(!(ctx->flags & IORING_SETUP_SQPOLL) ||
!ctx->sqo_task->mm || if (current->mm)
!mmget_not_zero(ctx->sqo_task->mm))) return 0;
return -EFAULT;
kthread_use_mm(ctx->sqo_task->mm); /* Should never happen */
if (unlikely(!(ctx->flags & IORING_SETUP_SQPOLL)))
return -EFAULT;
task_lock(ctx->sqo_task);
mm = ctx->sqo_task->mm;
if (unlikely(!mm || !mmget_not_zero(mm)))
mm = NULL;
task_unlock(ctx->sqo_task);
if (mm) {
kthread_use_mm(mm);
return 0;
} }
return 0; return -EFAULT;
} }
static int io_sq_thread_acquire_mm(struct io_ring_ctx *ctx, static int io_sq_thread_acquire_mm(struct io_ring_ctx *ctx,