usb: dwc3: of-simple: fix clock resource leak in dwc3_of_simple_probe

[PATCH] usb: dwc3: of-simple: fix clock resource leak in dwc3_of_simple_probe

Posted by Miaoqian Lin 1 month, 4 weeks ago

When clk_bulk_prepare_enable() fails, the error path jumps to
err_resetc_assert, skipping clk_bulk_put_all() and leaking the
clock references acquired by clk_bulk_get_all().

Add err_clk_put_all label to properly release clock resources
in all error paths.

Found via static analysis and code review.

Fixes: c0c61471ef86 ("usb: dwc3: of-simple: Convert to bulk clk API")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/usb/dwc3/dwc3-of-simple.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index a4954a21be93..c116143335d9 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -70,11 +70,11 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
 	simple->num_clocks = ret;
 	ret = clk_bulk_prepare_enable(simple->num_clocks, simple->clks);
 	if (ret)
-		goto err_resetc_assert;
+		goto err_clk_put_all;
 
 	ret = of_platform_populate(np, NULL, NULL, dev);
 	if (ret)
-		goto err_clk_put;
+		goto err_clk_disable;
 
 	pm_runtime_set_active(dev);
 	pm_runtime_enable(dev);
@@ -82,8 +82,9 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
 
 	return 0;
 
-err_clk_put:
+err_clk_disable:
 	clk_bulk_disable_unprepare(simple->num_clocks, simple->clks);
+err_clk_put_all:
 	clk_bulk_put_all(simple->num_clocks, simple->clks);
 
 err_resetc_assert:
-- 
2.25.1

Re: [PATCH] usb: dwc3: of-simple: fix clock resource leak in dwc3_of_simple_probe

Posted by Thinh Nguyen 1 month, 3 weeks ago

On Thu, Dec 11, 2025, Miaoqian Lin wrote:
> When clk_bulk_prepare_enable() fails, the error path jumps to
> err_resetc_assert, skipping clk_bulk_put_all() and leaking the
> clock references acquired by clk_bulk_get_all().
> 
> Add err_clk_put_all label to properly release clock resources
> in all error paths.
> 
> Found via static analysis and code review.
> 
> Fixes: c0c61471ef86 ("usb: dwc3: of-simple: Convert to bulk clk API")
> Cc: stable@vger.kernel.org
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
>  drivers/usb/dwc3/dwc3-of-simple.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
> index a4954a21be93..c116143335d9 100644
> --- a/drivers/usb/dwc3/dwc3-of-simple.c
> +++ b/drivers/usb/dwc3/dwc3-of-simple.c
> @@ -70,11 +70,11 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
>  	simple->num_clocks = ret;
>  	ret = clk_bulk_prepare_enable(simple->num_clocks, simple->clks);
>  	if (ret)
> -		goto err_resetc_assert;
> +		goto err_clk_put_all;
>  
>  	ret = of_platform_populate(np, NULL, NULL, dev);
>  	if (ret)
> -		goto err_clk_put;
> +		goto err_clk_disable;
>  
>  	pm_runtime_set_active(dev);
>  	pm_runtime_enable(dev);
> @@ -82,8 +82,9 @@ static int dwc3_of_simple_probe(struct platform_device *pdev)
>  
>  	return 0;
>  
> -err_clk_put:
> +err_clk_disable:
>  	clk_bulk_disable_unprepare(simple->num_clocks, simple->clks);
> +err_clk_put_all:
>  	clk_bulk_put_all(simple->num_clocks, simple->clks);
>  
>  err_resetc_assert:
> -- 
> 2.25.1
> 

Thanks for the catch!

Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>

BR,
Thinh