Patch "userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
userfaultfd-clear-the-vma-vm_userfaultfd_ctx-if-uffd_event_fork-fails.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
0cbb4b4f4c44f54af268969b18d8deda63aded59Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <[email protected]>
Date: Thu, 4 Jan 2018 16:18:09 -0800
Subject: userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails
From: Andrea Arcangeli <[email protected]>
commit 0cbb4b4f4c44f54af268969b18d8deda63aded59 upstream.
The previous fix in commit 384632e67e08 ("userfaultfd: non-cooperative:
fix fork use after free") corrected the refcounting in case of UFFD_EVENT_FORK failure for the fork userfault paths.
That still didn't clear the vma->vm_userfaultfd_ctx of the vmas that were set to point to the aborted new uffd ctx earlier in dup_userfaultfd.
--- fs/userfaultfd.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
fs/userfaultfd.c +18 -2
@@ -570,11 +570,14 @@ out:static void userfaultfd_event_wait_completion (struct userfaultfd_ctx *ctx,struct userfaultfd_wait_queue *ewq) { +struct userfaultfd_ctx *release_new_ctx; +if (WARN_ON_ONCE (current->flags &PF_EXITING )) goto out; ewq->ctx = ctx;init_waitqueue_entry (&ewq->wq, current); + release_new_ctx =NULL ;spin_lock (&ctx->event_wqh.lock);/*
@@ -601,8 +604,7 @@ static void userfaultfd_event_wait_compl new = (struct userfaultfd_ctx *) (unsigned long ) ewq->msg.arg.reserved.reserved1; - -userfaultfd_ctx_put (new); + release_new_ctx = new; }break ; }
@@ -617,6 +619,20 @@ static void userfaultfd_event_wait_compl__set_current_state (TASK_RUNNING );spin_unlock (&ctx->event_wqh.lock); +if (release_new_ctx) { +struct vm_area_struct *vma; +struct mm_struct *mm = release_new_ctx->mm; + +/* the various vma->vm_userfaultfd_ctx still points to it */ +down_write (&mm->mmap_sem); +for (vma = mm->mmap; vma; vma = vma->vm_next) +if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx) + vma->vm_userfaultfd_ctx =NULL_VM_UFFD_CTX ; +up_write (&mm->mmap_sem); + +userfaultfd_ctx_put (release_new_ctx); + } +/* * ctx may go away after this if the userfault pseudo fd is * already released.
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/userfaultfd-clear-the-vma-vm_userfaultfd_ctx-if-uffd_event_fork-fails.patch