]> www.infradead.org Git - users/jedix/linux-maple.git/commit
userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered
authorAndrea Arcangeli <aarcange@redhat.com>
Fri, 14 Dec 2018 22:17:17 +0000 (14:17 -0800)
committerBrian Maly <brian.maly@oracle.com>
Wed, 30 Jan 2019 04:19:26 +0000 (23:19 -0500)
commit6ab1d8ddfe9b5fd96afc76da97e54c96a5104262
treed3665ec793dff0d1dc7f57758d46d75d92411ef4
parentfd9c0d9cb219eb2485d2084a5b8359c5120ab85f
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: <stable@vger.kernel.org>
Fixes: 29ec90660d68 ("userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas")
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Reported-by: syzbot+06c7092e7d71218a2c16@syzkaller.appspotmail.com
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Orabug: 29163750
CVE: CVE-2018-18397

commit 01e881f5a1fca4677e82733061868c6d6ea05ca7 upstream

Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
fs/userfaultfd.c

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
fs/userfaultfd.c