Skip to content

Commit

Permalink
remoteproc: rcar_rproc: Call of_node_put() on iteration error
Browse files Browse the repository at this point in the history
commit f8bae63 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: 285892a ("remoteproc: Add Renesas rcar driver")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20230320221826.2728078-4-mathieu.poirier@linaro.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
mathieupoirier authored and gregkh committed May 17, 2023
1 parent 948f81d commit c3c7020
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/remoteproc/rcar_rproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,16 @@ static int rcar_rproc_prepare(struct rproc *rproc)

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;
Expand All @@ -79,8 +82,10 @@ static int rcar_rproc_prepare(struct rproc *rproc)
rcar_rproc_mem_release,
it.node->name);

if (!mem)
if (!mem) {
of_node_put(it.node);
return -ENOMEM;
}

rproc_add_carveout(rproc, mem);
}
Expand Down

0 comments on commit c3c7020

Please sign in to comment.