Skip to content

Commit c88033e

Browse files
xzpeterakpm00
authored andcommitted
mm/userfaultfd: reset ptes when close() for wr-protected ones
Userfaultfd unregister includes a step to remove wr-protect bits from all the relevant pgtable entries, but that only covered an explicit UFFDIO_UNREGISTER ioctl, not a close() on the userfaultfd itself. Cover that too. This fixes a WARN trace. The only user visible side effect is the user can observe leftover wr-protect bits even if the user close()ed on an userfaultfd when releasing the last reference of it. However hopefully that should be harmless, and nothing bad should happen even if so. This change is now more important after the recent page-table-check patch we merged in mm-unstable (446dd9a ("mm/page_table_check: support userfault wr-protect entries")), as we'll do sanity check on uffd-wp bits without vma context. So it's better if we can 100% guarantee no uffd-wp bit leftovers, to make sure each report will be valid. Link: https://lore.kernel.org/all/000000000000ca4df20616a0fe16@google.com/ Fixes: f369b07 ("mm/uffd: reset write protection when unregister with wp-mode") Analyzed-by: David Hildenbrand <david@redhat.com> Link: https://lkml.kernel.org/r/20240422133311.2987675-1-peterx@redhat.com Reported-by: syzbot+d8426b591c36b21c750e@syzkaller.appspotmail.com Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: Nadav Amit <nadav.amit@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 52ccdde commit c88033e

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/userfaultfd.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,10 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
895895
prev = vma;
896896
continue;
897897
}
898+
/* Reset ptes for the whole vma range if wr-protected */
899+
if (userfaultfd_wp(vma))
900+
uffd_wp_range(vma, vma->vm_start,
901+
vma->vm_end - vma->vm_start, false);
898902
new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS;
899903
vma = vma_modify_flags_uffd(&vmi, prev, vma, vma->vm_start,
900904
vma->vm_end, new_flags,

0 commit comments

Comments
 (0)