1 files changed, 13 insertions, 7 deletions

diff --git a/mm/memory.c b/mm/memory.c
index a84fbb772034..388dcf9aa283 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2670,6 +2670,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
         pte_unmap(page_table);
 
+        /* File mapping without ->vm_ops ? */
+        if (vma->vm_flags & VM_SHARED)
+                return VM_FAULT_SIGBUS;
+
         /* Check if we need to add a guard page to the stack */
         if (check_stack_guard_page(vma, address) < 0)
                 return VM_FAULT_SIGSEGV;
@@ -3099,6 +3103,9 @@ static int do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                         - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
 
         pte_unmap(page_table);
+        /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
+        if (!vma->vm_ops->fault)
+                return VM_FAULT_SIGBUS;
         if (!(flags & FAULT_FLAG_WRITE))
                 return do_read_fault(mm, vma, address, pmd, pgoff, flags,
                                 orig_pte);
@@ -3244,13 +3251,12 @@ static int handle_pte_fault(struct mm_struct *mm,
         barrier();
         if (!pte_present(entry)) {
                 if (pte_none(entry)) {
-                        if (vma->vm_ops) {
-                                if (likely(vma->vm_ops->fault))
-                                        return do_fault(mm, vma, address, pte,
-                                                        pmd, flags, entry);
-                        }
-                        return do_anonymous_page(mm, vma, address,
-                                                 pte, pmd, flags);
+                        if (vma->vm_ops)
+                                return do_fault(mm, vma, address, pte, pmd,
+                                                flags, entry);
+
+                        return do_anonymous_page(mm, vma, address, pte, pmd,
+                                        flags);
                 }
                 return do_swap_page(mm, vma, address,
                                         pte, pmd, flags, entry);