[PATCH] soc: dove: pmu: Fix device node reference leaks in dove_init_pmu()

Felix Gu posted 1 patch 6 days, 16 hours ago
drivers/soc/dove/pmu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
[PATCH] soc: dove: pmu: Fix device node reference leaks in dove_init_pmu()
Posted by Felix Gu 6 days, 16 hours ago
Use __free(device_node) cleanup attribute for domains_node and add
missing of_node_put(np_pmu) calls in error paths to prevent device
node reference leaks.

Fixes: 44e259ac909f ("ARM: dove: create a proper PMU driver for power domains, PMU IRQs and resets")Y
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
 drivers/soc/dove/pmu.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index dd8ade8e9ee8..3b2567f20649 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -371,7 +371,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata)
  */
 int __init dove_init_pmu(void)
 {
-	struct device_node *np_pmu, *domains_node;
+	struct device_node *np_pmu;
 	struct pmu_data *pmu;
 	int ret, parent_irq;
 
@@ -380,15 +380,19 @@ int __init dove_init_pmu(void)
 	if (!np_pmu)
 		return 0;
 
-	domains_node = of_get_child_by_name(np_pmu, "domains");
+	struct device_node *domains_node __free(device_node) =
+		of_get_child_by_name(np_pmu, "domains");
 	if (!domains_node) {
 		pr_err("%pOFn: failed to find domains sub-node\n", np_pmu);
+		of_node_put(np_pmu);
 		return 0;
 	}
 
 	pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);
-	if (!pmu)
+	if (!pmu) {
+		of_node_put(np_pmu);
 		return -ENOMEM;
+	}
 
 	spin_lock_init(&pmu->lock);
 	pmu->of_node = np_pmu;
@@ -399,6 +403,7 @@ int __init dove_init_pmu(void)
 		iounmap(pmu->pmu_base);
 		iounmap(pmu->pmc_base);
 		kfree(pmu);
+		of_node_put(np_pmu);
 		return -ENOMEM;
 	}
 

---
base-commit: 33a647c659ffa5bdb94abc345c8c86768ff96215
change-id: 20260131-dove_pmu-83fa64fb16ed

Best regards,
-- 
Felix Gu <ustc.gu@gmail.com>
Re: [PATCH] soc: dove: pmu: Fix device node reference leaks in dove_init_pmu()
Posted by Markus Elfring 5 days, 21 hours ago
> Use __free(device_node) cleanup attribute for domains_node and add
> missing of_node_put(np_pmu) calls in error paths to prevent device
> node reference leaks.

* Would scope-based resource management become relevant for both local variables?

* See also once more:
  https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.19-rc7#n34


Regards,
Markus