mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] pinctrl: stm32: Fix reset control leak in stm32_pctl_probe() error paths
@ 2026-11-10  8:32 Xiangwu Lai
  2026-11-18 21:08 ` Linus Walleij
  2026-11-18 21:09 ` Linus Walleij
  0 siblings, 2 replies; 5+ messages in thread
From: Xiangwu Lai @ 2026-11-10  8:32 UTC (permalink / raw)
  To: antonio.borneo, linusw
  Cc: mcoquelin.stm32, alexandre.torgue, linux-gpio, linux-stm32,
	linux-arm-kernel, linux-kernel, Xiangwu Lai

stm32_pctl_probe() acquires an exclusive reset control for every GPIO
bank with of_reset_control_get_exclusive(), but none of the error
paths release them again: the bank loop returns directly on
-EPROBE_DEFER and on a failed clock lookup, and the
clk_bulk_prepare_enable() failure and the err_register path also
leave the already acquired reset controls behind.

On success the reset controls are kept for the lifetime of the device
and are never released either (the driver has no .remove), but that
is harmless.  On a failed probe, and in particular when the probe is
retried after -EPROBE_DEFER, every attempt leaks another set of
reset control references.

Release the acquired reset controls on all error paths.

Also release the clocks of the already processed banks on the
-EPROBE_DEFER path, which was missed by the earlier clock leak fix
dfd8259507c5 ("pinctrl: stm32: Fix clock reference leak in
stm32_pctl_probe()").

Fixes: 2254e77665d5 ("pinctrl: stm32: defer probe if reset resource is not yet ready")
Signed-off-by: laixiangwu <laixiangwu@cmss.chinamobile.com>
---
Changes in v2:

- Point the Fixes tag at 2254e77665d5, which introduced the reset
  control acquisition in the stm32_pctl_probe() bank loop and the
  -EPROBE_DEFER return path; bb949ed9b16b only replaced the child
  node iteration helper (suggested by Sashiko AI review).
- Also release the clocks of the already processed banks on the
  -EPROBE_DEFER path, which was missed by dfd8259507c5.

Link: https://lore.kernel.org/all/20261110065722.1340-1-laixiangwu@cmss.chinamobile.com
 drivers/pinctrl/stm32/pinctrl-stm32.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 98cf9c6f4..2a54a0176 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1966,15 +1966,18 @@ int stm32_pctl_probe(struct platform_device *pdev)
 		bank->rstc = of_reset_control_get_exclusive(np, NULL);
 		if (PTR_ERR(bank->rstc) == -EPROBE_DEFER) {
 			fwnode_handle_put(child);
-			return -EPROBE_DEFER;
+			clk_bulk_put(i, pctl->clks);
+			ret = -EPROBE_DEFER;
+			goto err_put_rstcs;
 		}
 
 		pctl->clks[i].clk = of_clk_get_by_name(np, NULL);
 		if (IS_ERR(pctl->clks[i].clk)) {
 			fwnode_handle_put(child);
 			clk_bulk_put(i, pctl->clks);
-			return dev_err_probe(dev, PTR_ERR(pctl->clks[i].clk),
-					     "failed to get clk\n");
+			ret = dev_err_probe(dev, PTR_ERR(pctl->clks[i].clk),
+					    "failed to get clk\n");
+			goto err_put_rstcs;
 		}
 		pctl->clks[i].id = "pctl";
 		i++;
@@ -1984,7 +1987,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
 	if (ret) {
 		dev_err(dev, "failed to prepare_enable clk (%d)\n", ret);
 		clk_bulk_put(banks, pctl->clks);
-		return ret;
+		goto err_put_rstcs;
 	}
 
 	for_each_gpiochip_node(dev, child) {
@@ -2009,6 +2012,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
 
 	clk_bulk_disable_unprepare(banks, pctl->clks);
 	clk_bulk_put(banks, pctl->clks);
+err_put_rstcs:
+	for (i = 0; i < banks; i++)
+		if (!IS_ERR_OR_NULL(pctl->banks[i].rstc))
+			reset_control_put(pctl->banks[i].rstc);
 	return ret;
 }
 EXPORT_SYMBOL(stm32_pctl_probe);
-- 
2.50.1.windows.1




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-11-19 11:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-10  8:32 [PATCH v2] pinctrl: stm32: Fix reset control leak in stm32_pctl_probe() error paths Xiangwu Lai
2026-11-18 21:08 ` Linus Walleij
2026-11-18 21:09 ` Linus Walleij
2026-11-19  6:09   ` Xiangwu Lai
2026-11-19 11:27     ` Antonio Borneo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®