remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev()

[ Upstream commit e01ce676aaef3b13d02343d7e70f9637d93a3367 ]

The kfree() should be called when of_irq_get_byname() fails or
devm_request_threaded_irq() fails in qcom_add_sysmon_subdev(),
otherwise there will be a memory leak, so add kfree() to fix it.

Fixes: 027045a6e2b7 ("remoteproc: qcom: Add shutdown-ack irq")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221129105650.1539187-1-cuigaosheng1@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/remoteproc/qcom_sysmon.c b/drivers/remoteproc/qcom_sysmon.c
index a9f04dd83ab68050a7b04f73eadeacd906e18e93..fbfaf2637a91a87704cde6349814bc41f2500441 100644 (file)
--- a/drivers/remoteproc/qcom_sysmon.c
+++ b/drivers/remoteproc/qcom_sysmon.c
@@ -650,7 +650,9 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,
                if (sysmon->shutdown_irq != -ENODATA) {
                        dev_err(sysmon->dev,
                                "failed to retrieve shutdown-ack IRQ\n");
-                       return ERR_PTR(sysmon->shutdown_irq);
+                       ret = sysmon->shutdown_irq;
+                       kfree(sysmon);
+                       return ERR_PTR(ret);
                }
        } else {
                ret = devm_request_threaded_irq(sysmon->dev,
@@ -661,6 +663,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,
                if (ret) {
                        dev_err(sysmon->dev,
                                "failed to acquire shutdown-ack IRQ\n");
+                       kfree(sysmon);
                        return ERR_PTR(ret);
                }
        }