[PATCH v7 03/14] arm64/numa: add nid check for memory block

On 2016/8/26 20:39, Will Deacon wrote:

On Wed, Aug 24, 2016 at 03:44:42PM +0800, Zhen Lei wrote:

quoted

Use the same tactic to cpu and numa-distance nodes.

Signed-off-by: Zhen Lei <redacted>
---
 drivers/of/of_numa.c | 5 +++++
 1 file changed, 5 insertions(+)

The subject has arm64/numa, but this is clearly core OF code and

I originally added below check in arch/arm64/mm/numa.c, until Hanjun Guo
told me that it should move into drivers/of/of_numa.c

I forgot updating this.

requires an ack from Rob.

The commit message also doesn't make much sense to me.

quoted

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;
+		}

Do you really want to return from the function here? Shouldn't we at least
of_node_put(np), i.e. by using a break; ?

Thanks for pointing out this mistake. I will change to "r = -EINVAL" in the next version.

Will

.