Commit dce68a49 authored by Aleksandr Mishin's avatar Aleksandr Mishin Committed by Mathieu Poirier
Browse files

remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init 



In imx_rproc_addr_init() strcmp() is performed over the node after the
of_node_put() is performed over it.
Fix this error by moving of_node_put() calls.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 5e4c1243 ("remoteproc: imx_rproc: support remote cores booted before Linux Kernel")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAleksandr Mishin <amishin@t-argos.ru>
Link: https://lore.kernel.org/r/20240612131714.12907-1-amishin@t-argos.ru


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 8d3739db

drivers/remoteproc/imx_rproc.c

+6 −2
Original line number Diff line number Diff line
@@ -734,25 +734,29 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, 
			continue;

		}

		err = of_address_to_resource(node, 0, &res);

		of_node_put(node);

		if (err) {

			dev_err(dev, "unable to resolve memory region\n");

			of_node_put(node);

			return err;

		}



		if (b >= IMX_RPROC_MEM_MAX)

		if (b >= IMX_RPROC_MEM_MAX) {

			of_node_put(node);

			break;

		}



		/* Not use resource version, because we might share region */

		priv->mem[b].cpu_addr = devm_ioremap_wc(&pdev->dev, res.start, resource_size(&res));

		if (!priv->mem[b].cpu_addr) {

			dev_err(dev, "failed to remap %pr\n", &res);

			of_node_put(node);

			return -ENOMEM;

		}

		priv->mem[b].sys_addr = res.start;

		priv->mem[b].size = resource_size(&res);

		if (!strcmp(node->name, "rsc-table"))

			priv->rsc_table = priv->mem[b].cpu_addr;

		of_node_put(node);

		b++;

	}