Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665Ab0HSKxi (ORCPT ); Thu, 19 Aug 2010 06:53:38 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:42816 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377Ab0HSKxe (ORCPT ); Thu, 19 Aug 2010 06:53:34 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: KOSAKI Motohiro Subject: [PATCH 1/2] oom: fix NULL pointer dereference Cc: kosaki.motohiro@jp.fujitsu.com, LKML , linux-mm , Andrew Morton , David Rientjes , Linus Torvalds , KAMEZAWA Hiroyuki In-Reply-To: <20100819194707.5FC4.A69D9226@jp.fujitsu.com> References: <20100819194707.5FC4.A69D9226@jp.fujitsu.com> Message-Id: <20100819195310.5FC7.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Thu, 19 Aug 2010 19:53:31 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1071 Lines: 35 commit b940fd7035 (oom: remove unnecessary code and cleanup) added unnecessary NULL pointer dereference. remove it. Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 5014e50..17d48a6 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -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)), -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/