Commit 97264eaa authored by Vitalii Mordan's avatar Vitalii Mordan Committed by Greg Kroah-Hartman
Browse files

usb: ehci-hcd: fix call balance of clocks handling routines 



If the clocks priv->iclk and priv->fclk were not enabled in ehci_hcd_sh_probe,
they should not be disabled in any path.

Conversely, if they was enabled in ehci_hcd_sh_probe, they must be disabled
in all error paths to ensure proper cleanup.

Found by Linux Verification Center (linuxtesting.org) with Klever.

Fixes: 63c84552 ("usb: ehci-hcd: Add support for SuperH EHCI.")
Cc: stable@vger.kernel.org # ff30bd6a: sh: clk: Fix clk_enable() to return 0 on NULL clk
Signed-off-by: default avatarVitalii Mordan <mordan@ispras.ru>
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20241121114700.2100520-1-mordan@ispras.ru


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cdd30ebb

drivers/usb/host/ehci-sh.c

+7 −2
Original line number Diff line number Diff line
@@ -119,8 +119,12 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->iclk))

		priv->iclk = NULL;



	clk_enable(priv->fclk);

	clk_enable(priv->iclk);

	ret = clk_enable(priv->fclk);

	if (ret)

		goto fail_request_resource;

	ret = clk_enable(priv->iclk);

	if (ret)

		goto fail_iclk;



	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (ret != 0) {
@@ -136,6 +140,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev) 


fail_add_hcd:

	clk_disable(priv->iclk);

fail_iclk:

	clk_disable(priv->fclk);



fail_request_resource: