From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932734AbcE3IqS (ORCPT ); Mon, 30 May 2016 04:46:18 -0400 Received: from m50-133.163.com ([123.125.50.133]:33933 "EHLO m50-133.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754140AbcE3IqR (ORCPT ); Mon, 30 May 2016 04:46:17 -0400 From: Wenwei Tao To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov@virtuozzo.com Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, ww.tao0320@gmail.com Subject: [PATCH] mm/memcontrol.c: add memory allocation result check Date: Mon, 30 May 2016 16:45:51 +0800 Message-Id: <1464597951-2976-1-git-send-email-wwtao0320@163.com> X-Mailer: git-send-email 2.7.1.windows.2 X-CM-TRANSID: DdGowAA3d19X_UtX5eiVAA--.2786S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZF1rGrWxCrWfury3WF4kJFb_yoW3Grg_Ja yktrW0g3y8KryruF1DCwsaqFWayr409r1qga15Ary3KFyUtws09F97Jr45Gr1kuF93u3yY y34DAr4jgrnFkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0dHUDUUUUU== X-Originating-IP: [111.204.49.2] X-CM-SenderInfo: 5zzwt0aqtsiqqrwthudrp/xtbBFRl5sVXlUGOkwgAAsh Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wenwei Tao The mem_cgroup_tree_per_node allocation might fail, check that before continue the memcg init. Since it is in the init phase, trigger the panic if that failure happens. Signed-off-by: Wenwei Tao --- mm/memcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 925b431..6385c62 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5712,6 +5712,7 @@ static int __init mem_cgroup_init(void) rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, node_online(node) ? node : NUMA_NO_NODE); + BUG_ON(!rtpn); for (zone = 0; zone < MAX_NR_ZONES; zone++) { struct mem_cgroup_tree_per_zone *rtpz; -- 1.8.3.1