From e483e6eb1bbe8f5b300551e72648715f16d41a3e Mon Sep 17 00:00:00 2001 From: zhongjiang-ali Date: Tue, 25 Feb 2020 00:14:48 +0800 Subject: [PATCH 0886/2944] alinux: Fix an potential null pointer reference in dump_header to #26424311 Commit 5028e358bcd4 ("alinux: mm: oom_kill: show killed task's cgroup info in global oom") introduces an potential null pointer reference. It is because the task 'p' maybe an null pointer in same code path. Fixes: 5028e358bcd4 ("alinux: mm: oom_kill: show killed task's cgroup info in global oom") Signed-off-by: zhongjiang-ali Reviewed-by: Xunlei Pang --- mm/oom_kill.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index bcbac9d..d763971 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -449,6 +449,9 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) mem_cgroup_print_oom_info(oc->memcg, p); else { #ifdef CONFIG_MEMCG + if (!p) + p = current; + pr_info("Task in "); pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id)); pr_cont(" killed as a result of limit of host\n"); -- 1.8.3.1