1 files changed, 5 insertions, 1 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index f6d4ae9f1c69..1a21819a8e5e 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -680,7 +680,7 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
         unsigned int victim_points = 0;
         static DEFINE_RATELIMIT_STATE(oom_rs, DEFAULT_RATELIMIT_INTERVAL,
                                               DEFAULT_RATELIMIT_BURST);
-        bool can_oom_reap = true;
+        bool can_oom_reap;
 
         /*
          * If the task is already exiting, don't alarm the sysadmin or kill
@@ -742,6 +742,10 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
         /* Get a reference to safely compare mm after task_unlock(victim) */
         mm = victim->mm;
         atomic_inc(&mm->mm_count);
+
+        /* Make sure we do not try to oom reap the mm multiple times */
+        can_oom_reap = !test_and_set_bit(MMF_OOM_KILLED, &mm->flags);
+
         /*
          * We should send SIGKILL before setting TIF_MEMDIE in order to prevent
          * the OOM victim from depleting the memory reserves from the user