Commit 275314e9 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Greg Kroah-Hartman

userfaultfd: shmem: __do_fault requires VM_FAULT_NOPAGE


[ Upstream commit 6bbc4a41 ]

__do_fault assumes vmf->page has been initialized and is valid if
VM_FAULT_NOPAGE is not returned by vma->vm_ops->fault(vma, vmf).

handle_userfault() in turn should return VM_FAULT_NOPAGE if it doesn't
return VM_FAULT_SIGBUS or VM_FAULT_RETRY (the other two possibilities).

This VM_FAULT_NOPAGE case is only invoked when signal are pending and it
didn't matter for anonymous memory before.  It only started to matter
since shmem was introduced.  hugetlbfs also takes a different path and
doesn't exercise __do_fault.

Link: http://lkml.kernel.org/r/20170228154201.GH5816@redhat.comSigned-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bcd15bd
...@@ -419,7 +419,7 @@ int handle_userfault(struct fault_env *fe, unsigned long reason) ...@@ -419,7 +419,7 @@ int handle_userfault(struct fault_env *fe, unsigned long reason)
* in such case. * in such case.
*/ */
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
ret = 0; ret = VM_FAULT_NOPAGE;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment