]> git.itanic.dy.fi Git - linux-stable/commitdiff
remoteproc: stm32: Call of_node_put() on iteration error
authorMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 20 Mar 2023 22:18:22 +0000 (16:18 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:50:23 +0000 (11:50 +0200)
commit ccadca5baf5124a880f2bb50ed1ec265415f025b 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: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-2-mathieu.poirier@linaro.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/remoteproc/stm32_rproc.c

index b643efcf995a1beb57c1cd29169a8c87a2cf1347..a0fabc3f13dc2f35558862d18842d5b40b3c11bf 100644 (file)
@@ -223,11 +223,13 @@ static int stm32_rproc_prepare(struct rproc *rproc)
        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;
                }
 
                if (stm32_rproc_pa_to_da(rproc, rmem->base, &da) < 0) {
+                       of_node_put(it.node);
                        dev_err(dev, "memory region not valid %pa\n",
                                &rmem->base);
                        return -EINVAL;
@@ -254,8 +256,10 @@ static int stm32_rproc_prepare(struct rproc *rproc)
                                                           it.node->name);
                }
 
-               if (!mem)
+               if (!mem) {
+                       of_node_put(it.node);
                        return -ENOMEM;
+               }
 
                rproc_add_carveout(rproc, mem);
                index++;