[PATCH] nvmem: core: validate DT cell bits before allocating the name
From: James Hilliard
Date: Tue Nov 17 2026 - 17:15:05 EST
An invalid bits property makes nvmem_add_cells_from_dt() return before
it frees the cell name. Allocate the name after validating the property,
and fail before invoking the provider fixup if allocation fails.
Fixes: def3173d4f17 ("nvmem: core: Print error on wrong bits DT property")
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/sashiko-outbox-219531@xxxxxxxxxx/
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
drivers/nvmem/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 7d4cce8e2742..56e04c030c7f 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -819,7 +819,6 @@ int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
info.offset = be32_to_cpup(addr++);
info.bytes = be32_to_cpup(addr);
- info.name = kasprintf(GFP_KERNEL, "%pOFn", child);
addr = of_get_property(child, "bits", &len);
if (addr && len == (2 * sizeof(u32))) {
@@ -833,6 +832,9 @@ int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
}
}
+ info.name = kasprintf(GFP_KERNEL, "%pOFn", child);
+ if (!info.name)
+ return -ENOMEM;
info.np = of_node_get(child);
if (nvmem->fixup_dt_cell_info)
---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
base-tree: https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git for-fixes
change-id: 20261117-submit-nvmem-dt-cell-name-v1-e51d1f6674dd
Best regards,
--
James Hilliard <james.hilliard1@xxxxxxxxx>