raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe

Browse Source 
commit d4d2e5329a upstream.

If the first call to devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0)
fails with something other than -ENODEV then it leads to an error
pointer dereference.  For those errors we should just jump directly to
the error handling.

Fixes: 8253a34bfa ("usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211117074923.GF5237@kili
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter
2021-11-17 10:49:23 +03:00
committed by Greg Kroah-Hartman
parent b70ff391de
commit 56fbab4937
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/chipidea/ci_hdrc_imx.c
View File

@@ -425,7 +425,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0); data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0);
if (IS_ERR(data->phy)) { if (IS_ERR(data->phy)) {
ret = PTR_ERR(data->phy); ret = PTR_ERR(data->phy);
if (ret == -ENODEV) { if (ret != -ENODEV)
goto err_clk;
data->phy = devm_usb_get_phy_by_phandle(dev, "phys", 0); data->phy = devm_usb_get_phy_by_phandle(dev, "phys", 0);
if (IS_ERR(data->phy)) { if (IS_ERR(data->phy)) {
ret = PTR_ERR(data->phy); ret = PTR_ERR(data->phy);
@@ -435,7 +436,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
goto err_clk; goto err_clk;
} }
} }
}
pdata.usb_phy = data->phy; pdata.usb_phy = data->phy;
if (data->usbmisc_data) if (data->usbmisc_data)