[PATCH 4.9 028/177] userfaultfd: shmem: __do_fault requires VM_FAULT_NOPAGE
From: Greg Kroah-Hartman
Date: Mon Dec 18 2017 - 10:59:00 EST
4.9-stable review patch. If anyone has any objections, please let me know.
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
[ Upstream commit 6bbc4a4144b1a69743022ac68dfaf6e7d993abb9 ]
__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.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Reported-by: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
fs/userfaultfd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -419,7 +419,7 @@ int handle_userfault(struct fault_env *f
* in such case.
- ret = 0;
+ ret = VM_FAULT_NOPAGE;