This is a note to let you know that I've just added the patch titled
remoteproc: imx_rproc: Call of_node_put() on iteration error
to the 6.3-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-imx_rproc-call-of_node_put-on-iteration-error.patch
and it can be found in the queue-6.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5ef074e805ecfd9a16dbb7b6b88bbfa8abad7054 Mon Sep 17 00:00:00 2001
From: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Date: Mon, 20 Mar 2023 16:18:25 -0600
Subject: remoteproc: imx_rproc: Call of_node_put() on iteration error
From: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
commit 5ef074e805ecfd9a16dbb7b6b88bbfa8abad7054 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: b29b4249f8f0 ("remoteproc: imx_rproc: add i.MX specific parse fw hook")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Reviewed-by: Peng Fan <peng.fan@xxxxxxx>
Link: https://lore.kernel.org/r/20230320221826.2728078-5-mathieu.poirier@xxxxxxxxxx
Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/remoteproc/imx_rproc.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -541,6 +541,7 @@ static int imx_rproc_prepare(struct rpro
rmem = of_reserved_mem_lookup(it.node);
if (!rmem) {
+ of_node_put(it.node);
dev_err(priv->dev, "unable to acquire memory-region\n");
return -EINVAL;
}
@@ -553,10 +554,12 @@ static int imx_rproc_prepare(struct rpro
imx_rproc_mem_alloc, imx_rproc_mem_release,
it.node->name);
- if (mem)
+ if (mem) {
rproc_coredump_add_segment(rproc, da, rmem->size);
- else
+ } else {
+ 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.3/remoteproc-stm32-call-of_node_put-on-iteration-error.patch
queue-6.3/remoteproc-imx_dsp_rproc-call-of_node_put-on-iteration-error.patch
queue-6.3/remoteproc-st-call-of_node_put-on-iteration-error.patch
queue-6.3/remoteproc-rcar_rproc-call-of_node_put-on-iteration-error.patch
queue-6.3/perf-cs-etm-fix-timeless-decode-mode-detection.patch
queue-6.3/remoteproc-imx_rproc-call-of_node_put-on-iteration-error.patch
