diff options
| author | Tetsuo Handa | 2015-11-06 03:47:51 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2015-11-06 04:34:48 +0100 |
| commit | 880b768937e90c433c0c8254a22b1eb63df005a4 (patch) | |
| tree | 168f70d6da86b57bd11a8cc6253c0689c76a700b /mm/oom_kill.c | |
| parent | mm/oom_kill.c: reverse the order of setting TIF_MEMDIE and sending SIGKILL (diff) | |
| download | kernel-qcow2-linux-880b768937e90c433c0c8254a22b1eb63df005a4.tar.gz kernel-qcow2-linux-880b768937e90c433c0c8254a22b1eb63df005a4.tar.xz kernel-qcow2-linux-880b768937e90c433c0c8254a22b1eb63df005a4.zip | |
mm/oom_kill.c: fix potentially killing unrelated process
At the for_each_process() loop in oom_kill_process(), we are comparing
address of OOM victim's mm without holding a reference to that mm. If
there are a lot of processes to compare or a lot of "Kill process %d (%s)
sharing same memory" messages to print, for_each_process() loop could take
very long time.
It is possible that meanwhile the OOM victim exits and releases its mm,
and then mm is allocated with the same address and assigned to some
unrelated process. When we hit such race, the unrelated process will be
killed by error. To make sure that the OOM victim's mm does not go away
until for_each_process() loop finishes, get a reference on the OOM
victim's mm before calling task_unlock(victim).
[oleg@redhat.com: several fixes]
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8ad35aa45436..5ba743aaba87 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -552,8 +552,9 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p, victim = p; } - /* mm cannot safely be dereferenced after task_unlock(victim) */ + /* Get a reference to safely compare mm after task_unlock(victim) */ mm = victim->mm; + atomic_inc(&mm->mm_count); /* * We should send SIGKILL before setting TIF_MEMDIE in order to prevent * the OOM victim from depleting the memory reserves from the user @@ -591,6 +592,7 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p, } rcu_read_unlock(); + mmdrop(mm); put_task_struct(victim); } #undef K |