xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remoteproc: stm32: Call of_node_put() on iteration error

Browse Source 
commit ccadca5baf5124a880f2bb50ed1ec265415f025b upstream.

Function of_phandle_iterator_next() calls of_node_put() on the last
device_node it iterated over, but when the loop exits prematurely it has
to be called explicitly.

Fixes: 13140de09c ("remoteproc: stm32: add an ST stm32_rproc driver")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-2-mathieu.poirier@linaro.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier
2023-03-20 16:18:22 -06:00
committed by Greg Kroah-Hartman
parent 62fe5d74ef
commit 30e0834bec
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/remoteproc/stm32_rproc.c
View File

@@ -231,11 +231,13 @@ static int stm32_rproc_parse_memory_regions(struct rproc *rproc)
while (of_phandle_iterator_next(&it) == 0) { while (of_phandle_iterator_next(&it) == 0) {
rmem = of_reserved_mem_lookup(it.node); rmem = of_reserved_mem_lookup(it.node);
if (!rmem) { if (!rmem) {
of_node_put(it.node);
dev_err(dev, "unable to acquire memory-region\n"); dev_err(dev, "unable to acquire memory-region\n");
return -EINVAL; return -EINVAL;
} }
if (stm32_rproc_pa_to_da(rproc, rmem->base, &da) < 0) { if (stm32_rproc_pa_to_da(rproc, rmem->base, &da) < 0) {
of_node_put(it.node);
dev_err(dev, "memory region not valid %pa\n", dev_err(dev, "memory region not valid %pa\n",
&rmem->base); &rmem->base);
return -EINVAL; return -EINVAL;
@@ -262,8 +264,10 @@ static int stm32_rproc_parse_memory_regions(struct rproc *rproc)
it.node->name); it.node->name);
} }
if (!mem) if (!mem) {
of_node_put(it.node);
return -ENOMEM; return -ENOMEM;
}
rproc_add_carveout(rproc, mem); rproc_add_carveout(rproc, mem);
index++; index++;