From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: andersson@kernel.org
Cc: shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
patrice.chotard@foss.st.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@foss.st.com, arnaud.pouliquen@st.com,
hongxing.zhu@nxp.com, peng.fan@nxp.com, shengjiu.wang@nxp.com,
linux-remoteproc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] remoteproc: st: Call of_node_put() on iteration error
Date: Mon, 20 Mar 2023 16:18:23 -0600 [thread overview]
Message-ID: <20230320221826.2728078-3-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20230320221826.2728078-1-mathieu.poirier@linaro.org>
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: 3df52ed7f269 ("remoteproc: st: add reserved memory support")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/remoteproc/st_remoteproc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index a3268d95a50e..e6bd3c7a950a 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -129,6 +129,7 @@ static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
while (of_phandle_iterator_next(&it) == 0) {
rmem = of_reserved_mem_lookup(it.node);
if (!rmem) {
+ of_node_put(it.node);
dev_err(dev, "unable to acquire memory-region\n");
return -EINVAL;
}
@@ -150,8 +151,10 @@ static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
it.node->name);
}
- if (!mem)
+ if (!mem) {
+ of_node_put(it.node);
return -ENOMEM;
+ }
rproc_add_carveout(rproc, mem);
index++;
--
2.25.1
next prev parent reply other threads:[~2023-03-20 22:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 22:18 [PATCH 0/5] remoteproc: Call of_node_put() on iteration error Mathieu Poirier
2023-03-20 22:18 ` [PATCH 1/5] remoteproc: stm32: " Mathieu Poirier
2023-03-21 9:00 ` Arnaud POULIQUEN
2023-03-21 21:32 ` Mathieu Poirier
2023-03-22 8:21 ` Arnaud POULIQUEN
2023-03-20 22:18 ` Mathieu Poirier [this message]
2023-03-21 9:01 ` [PATCH 2/5] remoteproc: st: " Arnaud POULIQUEN
2023-03-20 22:18 ` [PATCH 3/5] remoteproc: rcar_rproc: " Mathieu Poirier
2023-03-20 22:18 ` [PATCH 4/5] remoteproc: imx_rproc: " Mathieu Poirier
2023-03-21 3:00 ` Peng Fan
2023-03-20 22:18 ` [PATCH 5/5] retmoteproc: imx_dsp_rproc: " Mathieu Poirier
2023-03-20 23:02 ` Fabio Estevam
2023-03-21 21:19 ` Mathieu Poirier
2023-03-21 3:34 ` S.J. Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230320221826.2728078-3-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=arnaud.pouliquen@st.com \
--cc=festevam@gmail.com \
--cc=hongxing.zhu@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=patrice.chotard@foss.st.com \
--cc=peng.fan@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).