On 3/20/23 23:18, Mathieu Poirier wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx>
Thanks,
Arnaud
> ---
> 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++;
