From: Andrea Arcangeli Date: Fri, 14 Dec 2018 22:17:17 +0000 (-0800) Subject: userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered X-Git-Tag: v4.1.12-124.31.3~300 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6ab1d8ddfe9b5fd96afc76da97e54c96a5104262;p=users%2Fjedix%2Flinux-maple.git userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered Calling UFFDIO_UNREGISTER on virtual ranges not yet registered in uffd could trigger an harmless false positive WARN_ON. Check the vma is already registered before checking VM_MAYWRITE to shut off the false positive warning. Link: http://lkml.kernel.org/r/20181206212028.18726-2-aarcange@redhat.com Cc: Fixes: 29ec90660d68 ("userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas") Signed-off-by: Andrea Arcangeli Reported-by: syzbot+06c7092e7d71218a2c16@syzkaller.appspotmail.com Acked-by: Mike Rapoport Acked-by: Hugh Dickins Acked-by: Peter Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Orabug: 29163750 CVE: CVE-2018-18397 commit 01e881f5a1fca4677e82733061868c6d6ea05ca7 upstream Signed-off-by: Brian Maly Conflicts: fs/userfaultfd.c Signed-off-by: Shan Hai Reviewed-by: Jack Vogel Signed-off-by: Brian Maly --- diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 4d6ccc347e07..1d1992ec830d 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1104,7 +1104,6 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, cond_resched(); BUG_ON(vma->vm_ops && !is_vm_hugetlb_page(vma)); - WARN_ON(!(vma->vm_flags & VM_MAYWRITE)); /* * Nothing to do: this vma is already registered into this @@ -1113,6 +1112,8 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, if (!vma->vm_userfaultfd_ctx.ctx) goto skip; + WARN_ON(!(vma->vm_flags & VM_MAYWRITE)); + if (vma->vm_start > start) start = vma->vm_start; vma_end = min(end, vma->vm_end);