remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region

[ Upstream commit 07a5dcc4bed9d7cae54adf5aa10ff9f037a3204b ]

The device_node pointer is returned by of_parse_phandle() or
of_get_child_by_name() with refcount incremented.
We should use of_node_put() on it when done.

This function only call of_node_put(node) when of_address_to_resource
succeeds, missing error cases.

Fixes: 278d744c46fd ("remoteproc: qcom: Fix potential device node leaks")
Fixes: 051fb70fd4ea ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220308064522.13804-1-linmq006@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 423b31d..ca1c738 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -1624,18 +1624,20 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
         * reserved memory regions from device's memory-region property.
         */
        child = of_get_child_by_name(qproc->dev->of_node, "mba");
-       if (!child)
+       if (!child) {
                node = of_parse_phandle(qproc->dev->of_node,
                                        "memory-region", 0);
-       else
+       } else {
                node = of_parse_phandle(child, "memory-region", 0);
+               of_node_put(child);
+       }
 
        ret = of_address_to_resource(node, 0, &r);
+       of_node_put(node);
        if (ret) {
                dev_err(qproc->dev, "unable to resolve mba region\n");
                return ret;
        }
-       of_node_put(node);
 
        qproc->mba_phys = r.start;
        qproc->mba_size = resource_size(&r);
@@ -1646,14 +1648,15 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
        } else {
                child = of_get_child_by_name(qproc->dev->of_node, "mpss");
                node = of_parse_phandle(child, "memory-region", 0);
+               of_node_put(child);
        }
 
        ret = of_address_to_resource(node, 0, &r);
+       of_node_put(node);
        if (ret) {
                dev_err(qproc->dev, "unable to resolve mpss region\n");
                return ret;
        }
-       of_node_put(node);
 
        qproc->mpss_phys = qproc->mpss_reloc = r.start;
        qproc->mpss_size = resource_size(&r);