linux-kernel - Re: [PATCH] USB: ehci-omap: Fix missing usb_phy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <7c6ed1af-46c8-425b-83a5-4692095144a6@rowland.harvard.edu>
Date: Tue, 2 Dec 2025 11:05:44 -0500
From: Alan Stern <stern@...land.harvard.edu>
To: Haotian Zhang <vulab@...as.ac.cn>
Cc: gregkh@...uxfoundation.org, linux-usb@...r.kernel.org,
	linux-omap@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] USB: ehci-omap: Fix missing usb_phy_init() error handling

On Tue, Dec 02, 2025 at 04:00:27PM +0800, Haotian Zhang wrote:
> usb_phy_init() may fail if the PHY clock or regulator setup fails,
> but ehci_hcd_omap_probe() does not check its return value,
> potentially causing later operations to act on an uninitialized PHY.
> 
> Add proper error checking for usb_phy_init() calls. Add a new
> error label to properly remove the hcd.
> 
> Fixes: 4e5c9e6fa2d2 ("USB: ehci-omap: Tweak PHY initialization sequence")
> Fixes: 49f092198f4f ("USB: ehci-omap: Fix detection in HSIC mode")
> Signed-off-by: Haotian Zhang <vulab@...as.ac.cn>
> ---
>  drivers/usb/host/ehci-omap.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index db4a1acb27da..30b3586fd696 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -166,7 +166,11 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
>  		omap->phy[i] = phy;
>  
>  		if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY) {
> -			usb_phy_init(omap->phy[i]);
> +			ret = usb_phy_init(omap->phy[i]);
> +			if (ret) {
> +				dev_err(dev, "Failed to init PHY %d\n", i);
> +				goto err_phy;
> +			}
>  			/* bring PHY out of suspend */
>  			usb_phy_set_suspend(omap->phy[i], 0);
>  		}
> @@ -205,13 +209,19 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
>  		     pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY)
>  			continue;
>  
> -		usb_phy_init(omap->phy[i]);
> +		ret = usb_phy_init(omap->phy[i]);
> +		if (ret) {
> +			dev_err(dev, "Failed to init PHY %d\n", i);
> +			goto err_remove_hcd;
> +		}
>  		/* bring PHY out of suspend */
>  		usb_phy_set_suspend(omap->phy[i], 0);
>  	}
>  
>  	return 0;
>  
> +err_remove_hcd:
> +	usb_remove_hcd(hcd);
>  err_pm_runtime:
>  	pm_runtime_put_sync(dev);
>  	pm_runtime_disable(dev);

This basically looks okay.  But...

I don't know much about the usb-phy code.  Is it really okay to call 
usb_phy_shutdown() for something that hasn't gone through 
usb_phy_init()?  (Yes, the original code already does this -- maybe 
the original code is also wrong.)

Alan Stern