Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be71cf22 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

oom: fix NULL pointer dereference 



Commit b940fd70 ("oom: remove unnecessary code and cleanup") added an
unnecessary NULL pointer dereference.  remove it.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f522886e

mm/oom_kill.c

+2 −3
Original line number Diff line number Diff line
@@ -401,10 +401,9 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, 
static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)

{

	p = find_lock_task_mm(p);

	if (!p) {

		task_unlock(p);

	if (!p)

		return 1;

	}



	pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",

		task_pid_nr(p), p->comm, K(p->mm->total_vm),

		K(get_mm_counter(p->mm, MM_ANONPAGES)),