1 files changed, 7 insertions, 4 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 890095f5f36d..b273cc12b15d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -810,8 +810,12 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
                  */
                 if (unlikely(details))
                         continue;
-                if (!pte_file(ptent))
-                        free_swap_and_cache(pte_to_swp_entry(ptent));
+                if (pte_file(ptent)) {
+                        if (unlikely(!(vma->vm_flags & VM_NONLINEAR)))
+                                print_bad_pte(vma, addr, ptent, NULL);
+                } else if
+                  (unlikely(!free_swap_and_cache(pte_to_swp_entry(ptent))))
+                        print_bad_pte(vma, addr, ptent, NULL);
                 pte_clear_not_present_full(mm, addr, pte, tlb->fullmm);
         } while (pte++, addr += PAGE_SIZE, (addr != end && *zap_work > 0));
 
@@ -2707,8 +2711,7 @@ static int do_nonlinear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         if (!pte_unmap_same(mm, pmd, page_table, orig_pte))
                 return 0;
 
-        if (unlikely(!(vma->vm_flags & VM_NONLINEAR) ||
-                        !(vma->vm_flags & VM_CAN_NONLINEAR))) {
+        if (unlikely(!(vma->vm_flags & VM_NONLINEAR))) {
                 /*
                  * Page table corrupted: show pte and kill process.
                  */