2 files changed, 21 insertions, 0 deletions

diff --git a/mm/memory.c b/mm/memory.c
index f1a68049edff..4bfc3a9c3b18 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3658,6 +3658,19 @@ int handle_mm_fault(struct vm_area_struct *vma, unsigned long address,
                         mem_cgroup_oom_synchronize(false);
         }
 
+        /*
+         * This mm has been already reaped by the oom reaper and so the
+         * refault cannot be trusted in general. Anonymous refaults would
+         * lose data and give a zero page instead e.g. This is especially
+         * problem for use_mm() because regular tasks will just die and
+         * the corrupted data will not be visible anywhere while kthread
+         * will outlive the oom victim and potentially propagate the date
+         * further.
+         */
+        if (unlikely((current->flags & PF_KTHREAD) && !(ret & VM_FAULT_ERROR)
+                                && test_bit(MMF_UNSTABLE, &vma->vm_mm->flags)))
+                ret = VM_FAULT_SIGBUS;
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(handle_mm_fault);
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 3b990544db6d..5a3ba96c8338 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -495,6 +495,14 @@ static bool __oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm)
                 goto unlock_oom;
         }
 
+        /*
+         * Tell all users of get_user/copy_from_user etc... that the content
+         * is no longer stable. No barriers really needed because unmapping
+         * should imply barriers already and the reader would hit a page fault
+         * if it stumbled over a reaped memory.
+         */
+        set_bit(MMF_UNSTABLE, &mm->flags);
+
         tlb_gather_mmu(&tlb, mm, 0, -1);
         for (vma = mm->mmap ; vma; vma = vma->vm_next) {
                 if (is_vm_hugetlb_page(vma))