[PATCH v3 10/11] nvmem: u-boot-env: propagate cell registration errors
From: James Hilliard
Date: Fri Nov 20 2026 - 15:09:55 EST
The environment parser ignores cell registration failures, so allocation
failures can leave a partially populated layout reported as successfully
registered. The OF node reference obtained for a rejected cell is also
leaked.
Return the registration error and release the node reference that was
not transferred to a cell.
Fixes: 7c8979b42b1a ("nvmem: u-boot-env: use nvmem_add_one_cell() nvmem subsystem helper")
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxxxxxxxx>
---
drivers/nvmem/layouts/u-boot-env.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/nvmem/layouts/u-boot-env.c b/drivers/nvmem/layouts/u-boot-env.c
index f1fb206846ff..83c687e43e5a 100644
--- a/drivers/nvmem/layouts/u-boot-env.c
+++ b/drivers/nvmem/layouts/u-boot-env.c
@@ -55,6 +55,7 @@ static int u_boot_env_parse_cells(struct device *dev, struct nvmem_device *nvmem
{
char *data = buf + data_offset;
char *var, *value, *eq;
+ int ret;
for (var = data;
var < data + data_len && *var;
@@ -79,10 +80,12 @@ static int u_boot_env_parse_cells(struct device *dev, struct nvmem_device *nvmem
info.read_post_process = u_boot_env_read_post_process_ethaddr;
}
- if (layout)
- nvmem_layout_add_cell(layout, &info);
- else
- nvmem_add_one_cell(nvmem, &info);
+ ret = layout ? nvmem_layout_add_cell(layout, &info) :
+ nvmem_add_one_cell(nvmem, &info);
+ if (ret) {
+ of_node_put(info.np);
+ return ret;
+ }
}
return 0;
--
2.53.0