1 files changed, 13 insertions, 12 deletions

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index ccbdbd62f0d8..fe6d804a38dc 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -880,6 +880,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
         /* len == 0 means wake all */
         struct userfaultfd_wake_range range = { .len = 0, };
         unsigned long new_flags;
+        bool still_valid;
 
         WRITE_ONCE(ctx->released, true);
 
@@ -895,8 +896,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
          * taking the mmap_sem for writing.
          */
         down_write(&mm->mmap_sem);
-        if (!mmget_still_valid(mm))
-                goto skip_mm;
+        still_valid = mmget_still_valid(mm);
         prev = NULL;
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
                 cond_resched();
@@ -907,19 +907,20 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
                         continue;
                 }
                 new_flags = vma->vm_flags & ~(VM_UFFD_MISSING | VM_UFFD_WP);
-                prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end,
-                                 new_flags, vma->anon_vma,
-                                 vma->vm_file, vma->vm_pgoff,
-                                 vma_policy(vma),
-                                 NULL_VM_UFFD_CTX);
-                if (prev)
-                        vma = prev;
-                else
-                        prev = vma;
+                if (still_valid) {
+                        prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end,
+                                         new_flags, vma->anon_vma,
+                                         vma->vm_file, vma->vm_pgoff,
+                                         vma_policy(vma),
+                                         NULL_VM_UFFD_CTX);
+                        if (prev)
+                                vma = prev;
+                        else
+                                prev = vma;
+                }
                 vma->vm_flags = new_flags;
                 vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
         }
-skip_mm:
         up_write(&mm->mmap_sem);
         mmput(mm);
 wakeup: