This is a note to let you know that I've just added the patch titled
remoteproc: rcar_rproc: Call of_node_put() on iteration error
to the 6.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
remoteproc-rcar_rproc-call-of_node_put-on-iteration-error.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f8bae637d3d5e082b4ced71e28b16eb3ee0683c1 Mon Sep 17 00:00:00 2001
From: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Date: Mon, 20 Mar 2023 16:18:24 -0600
Subject: remoteproc: rcar_rproc: Call of_node_put() on iteration error
From: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
commit f8bae637d3d5e082b4ced71e28b16eb3ee0683c1 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: 285892a74f13 ("remoteproc: Add Renesas rcar driver")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230320221826.2728078-4-mathieu.poirier@xxxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/remoteproc/rcar_rproc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/drivers/remoteproc/rcar_rproc.c
+++ b/drivers/remoteproc/rcar_rproc.c
@@ -62,13 +62,16 @@ static int rcar_rproc_prepare(struct rpr
rmem = of_reserved_mem_lookup(it.node);
if (!rmem) {
+ of_node_put(it.node);
dev_err(&rproc->dev,
"unable to acquire memory-region\n");
return -EINVAL;
}
- if (rmem->base > U32_MAX)
+ if (rmem->base > U32_MAX) {
+ of_node_put(it.node);
return -EINVAL;
+ }
/* No need to translate pa to da, R-Car use same map */
da = rmem->base;
@@ -79,8 +82,10 @@ static int rcar_rproc_prepare(struct rpr
rcar_rproc_mem_release,
it.node->name);
- if (!mem)
+ if (!mem) {
+ of_node_put(it.node);
return -ENOMEM;
+ }
rproc_add_carveout(rproc, mem);
}
Patches currently in stable-queue which might be from mathieu.poirier@xxxxxxxxxx are
queue-6.2/remoteproc-stm32-call-of_node_put-on-iteration-error.patch
queue-6.2/remoteproc-imx_dsp_rproc-call-of_node_put-on-iteration-error.patch
queue-6.2/remoteproc-st-call-of_node_put-on-iteration-error.patch
queue-6.2/remoteproc-rcar_rproc-call-of_node_put-on-iteration-error.patch
queue-6.2/mailbox-zynqmp-fix-counts-of-child-nodes.patch
queue-6.2/perf-cs-etm-fix-timeless-decode-mode-detection.patch
queue-6.2/remoteproc-imx_rproc-call-of_node_put-on-iteration-error.patch
