From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932963AbcHKJfB (ORCPT ); Thu, 11 Aug 2016 05:35:01 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:59312 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbcHKJe6 (ORCPT ); Thu, 11 Aug 2016 05:34:58 -0400 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , linux-kernel , Rob Herring , "Frank Rowand" , devicetree CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH v6 03/14] arm64/numa: add nid check for memory block Date: Thu, 11 Aug 2016 17:33:37 +0800 Message-ID: <1470908028-8596-4-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1470908028-8596-1-git-send-email-thunder.leizhen@huawei.com> References: <1470908028-8596-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.57AC46BC.00B7,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: a2b3eba0bec3370b7d9c21d8255b5244 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the same tactic to cpu and numa-distance nodes. Signed-off-by: Zhen Lei --- drivers/of/of_numa.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 7b3fbdc..afaeb9c 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -75,6 +75,11 @@ static int __init of_numa_parse_memory_nodes(void) */ continue; + if (nid >= MAX_NUMNODES) { + pr_warn("NUMA: Node id %u exceeds maximum value\n", nid); + return -EINVAL; + } + for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++) r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1); -- 2.5.0