summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorDonet Tom <donettom@linux.ibm.com>2025-08-22 11:48:45 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-15 12:58:00 +0300
commit4a594f5c64bf0f0dd0aeb55f7731f45eb244875b (patch)
tree95e5c7c4cd2f058508d68299fc34017884dd7a1d /drivers/base
parentd12f4499585a2d66d5bd388a476f2b161eadd6a9 (diff)
downloadlinux-4a594f5c64bf0f0dd0aeb55f7731f45eb244875b.tar.xz
drivers/base/node: handle error properly in register_one_node()
[ Upstream commit 786eb990cfb78aab94eb74fb32a030e14723a620 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/node.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 4d588f4658c8..7b2ff66c119a 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -878,6 +878,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) {