kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oom: fix possible oom_dump_tasks NULL pointer

Browse source 
When /proc/sys/vm/oom_dump_tasks is enabled, it is possible to get a NULL
pointer for tasks that have detached mm's since task_lock() is not held
during the tasklist scan.  Add the task_lock().

Acked-by: Nick Piggin <npiggin@suse.de>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Rientjes 2009-05-28 14:34:19 -07:00 committed by Linus Torvalds
parent 681a1b4032
commit 6d2661ede5
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mm/oom_kill.c
View file

@ -284,22 +284,28 @@ static void dump_tasks(const struct mem_cgroup *mem)
printk(KERN_INFO "[ pid ] uid tgid total_vm rss cpu oom_adj " printk(KERN_INFO "[ pid ] uid tgid total_vm rss cpu oom_adj "
"name\n"); "name\n");
do_each_thread(g, p) { do_each_thread(g, p) {
/* struct mm_struct *mm;
* total_vm and rss sizes do not exist for tasks with a
* detached mm so there's no need to report them.
*/
if (!p->mm)
continue;
if (mem && !task_in_mem_cgroup(p, mem)) if (mem && !task_in_mem_cgroup(p, mem))
continue; continue;
if (!thread_group_leader(p)) if (!thread_group_leader(p))
continue; continue;
task_lock(p); task_lock(p);
mm = p->mm;
if (!mm) {
/*
* total_vm and rss sizes do not exist for tasks with no
* mm so there's no need to report them; they can't be
* oom killed anyway.
*/
task_unlock(p);
continue;
}
printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d %3d %s\n", printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d %3d %s\n",
p->pid, __task_cred(p)->uid, p->tgid, p->pid, __task_cred(p)->uid, p->tgid, mm->total_vm,
p->mm->total_vm, get_mm_rss(p->mm), (int)task_cpu(p), get_mm_rss(mm), (int)task_cpu(p), p->oomkilladj,
p->oomkilladj, p->comm); p->comm);
task_unlock(p); task_unlock(p);
} while_each_thread(g, p); } while_each_thread(g, p);
} }