remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev()

gscui · gregkh · commit 131c0a3ead78 · 2022-12-31T13:14:36.000+01:00
[ Upstream commit e01ce67 ] 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: 027045a ("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
@@ -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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,9 @@ struct qcom_sysmon qcom_add_sysmon_subdev(struct rproc rproc,`
`650`	`650`	`if (sysmon->shutdown_irq != -ENODATA) {`
`651`	`651`	`dev_err(sysmon->dev,`
`652`	`652`	`"failed to retrieve shutdown-ack IRQ\n");`
`653`		`- return ERR_PTR(sysmon->shutdown_irq);`
	`653`	`+ ret = sysmon->shutdown_irq;`
	`654`	`+ kfree(sysmon);`
	`655`	`+ return ERR_PTR(ret);`
`654`	`656`	`}`
`655`	`657`	`} else {`
`656`	`658`	`ret = devm_request_threaded_irq(sysmon->dev,`
`@@ -661,6 +663,7 @@ struct qcom_sysmon qcom_add_sysmon_subdev(struct rproc rproc,`
`661`	`663`	`if (ret) {`
`662`	`664`	`dev_err(sysmon->dev,`
`663`	`665`	`"failed to acquire shutdown-ack IRQ\n");`
	`666`	`+ kfree(sysmon);`
`664`	`667`	`return ERR_PTR(ret);`
`665`	`668`	`}`
`666`	`669`	`}`