]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
authorAleksandr Mishin <amishin@t-argos.ru>
Wed, 12 Jun 2024 13:17:14 +0000 (16:17 +0300)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 17 Jun 2024 14:39:00 +0000 (08:39 -0600)
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: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores booted before Linux Kernel")
Cc: stable@vger.kernel.org
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
Link: https://lore.kernel.org/r/20240612131714.12907-1-amishin@t-argos.ru
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/remoteproc/imx_rproc.c

index 39eacd90af144074335d3f4e49d6bbf527a3274c..144c8e9a642e8b3ffd075f75640725352de6ca27 100644 (file)
@@ -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++;
        }