]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drivers/base/node: handle error properly in register_one_node()
authorDonet Tom <donettom@linux.ibm.com>
Fri, 22 Aug 2025 08:48:45 +0000 (14:18 +0530)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 12 Sep 2025 00:25:17 +0000 (17:25 -0700)
If register_node() returns an error, it is not handled correctly.
The function will proceed further and try to register CPUs under the
node, which is not correct.

So, in this patch, if register_node() returns an error, we return
immediately from the function.

Link: https://lkml.kernel.org/r/20250822084845.19219-1-donettom@linux.ibm.com
Fixes: 76b67ed9dce6 ("[PATCH] node hotplug: register cpu: remove node struct")
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Donet Tom <donettom@linux.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Joanthan Cameron <Jonathan.Cameron@huawei.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Cc: Yury Norov (NVIDIA) <yury.norov@gmail.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/base/node.c

index 3399594136b2a1e58e95b0d13ee7441dd9e5cb9e..45d512939c40896ac28b9e0f588bc4977fca6169 100644 (file)
@@ -885,6 +885,11 @@ int register_one_node(int nid)
        node_devices[nid] = node;
 
        error = register_node(node_devices[nid], nid);
+       if (error) {
+               node_devices[nid] = NULL;
+               kfree(node);
+               return error;
+       }
 
        /* link cpu under this node */
        for_each_present_cpu(cpu) {