usb: xhci-dwc3: Fix usage of bulk PHY API
Subsystems (2)
PATCH 1/1 usb: xhci-dwc3: Fix usage of bulk PHY API
The PHY consumer is responsible for allocating the struct phy_bulk. During conversion to the bulk API, the contents of the struct were replaced by a pointer instead of the struct itself. This leads to a null pointer dereference in generic_phy_get_bulk() when setting bulk->phys.
--- drivers/usb/host/xhci-dwc3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-dwc3.c +3 -3
@@ -19,7 +19,7 @@#include <linux/usb/otg.h> struct xhci_dwc3_platdata { -struct phy_bulk *usb_phys; +struct phy_bulk usb_phys; };void dwc3_set_mode (struct dwc3 *dwc3_reg,u32 mode)
@@ -124,7 +124,7 @@ static int xhci_dwc3_probe(struct udevice *dev) hcor = (struct xhci_hcor *)((uintptr_t )hccr +HC_LENGTH (xhci_readl (&(hccr)->cr_capbase))); - ret =dwc3_setup_phy (dev, plat->usb_phys); + ret =dwc3_setup_phy (dev, &plat->usb_phys);if (ret && (ret != -ENOTSUPP ))return ret;
@@ -167,7 +167,7 @@ static int xhci_dwc3_remove(struct udevice *dev) {struct xhci_dwc3_platdata *plat =dev_get_platdata (dev); -dwc3_shutdown_phy (dev, plat->usb_phys); +dwc3_shutdown_phy (dev, &plat->usb_phys);return xhci_deregister (dev); }
Signature · 1 line
2.24.1
Hi,
my mistake is already fixed and merged by commit "usb: dwc3: fix NULL pointer issue" by original author of xhci/bulk-api
https://gitlab.denx.de/u-boot/u-boot/-/commit/58221d7e876c2f75ae7696aad853d81ccd76fb7a
regards Frank
PATCH 1/1 usb: xhci-dwc3: Fix usage of bulk PHY API
In reply to Samuel HollandHi Samuel,
This bug was fixed up two weeks ago,
https://patchwork.ozlabs.org/project/uboot/patch/1589435712-8795-1-git-send-email-chunfeng.yun at mediatek.com/
thanks
Quoted 42 lines · Samuel Holland
The PHY consumer is responsible for allocating the struct
phy_bulk. During conversion to the bulk API, the contents of the struct were replaced by a pointer instead of the struct itself. This leads to a null pointer dereference ingeneric_phy_get_bulk()when settingbulk->phys.Fixes 6dfb8a8052ee ("usb: dwc3: use the phy bulk API to get phys")Signed-off-by Samuel Holland <[email protected]>--- drivers/usb/host/xhci-dwc3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/usb/host/xhci-dwc3.c +3
-3@@ -19,7 +19,7 @@#include <linux/usb/otg.h> struct xhci_dwc3_platdata { -struct phy_bulk *usb_phys; +struct phy_bulk usb_phys; };void dwc3_set_mode (struct dwc3 *dwc3_reg,u32 mode)@@ -124,7 +124,7 @@ static int xhci_dwc3_probe(struct udevice *dev) hcor = (struct xhci_hcor *)((uintptr_t )hccr +HC_LENGTH (xhci_readl (&(hccr)->cr_capbase))); - ret =dwc3_setup_phy (dev, plat->usb_phys); + ret =dwc3_setup_phy (dev, &plat->usb_phys);if (ret && (ret != -ENOTSUPP ))return ret;@@ -167,7 +167,7 @@ static int xhci_dwc3_remove(struct udevice *dev) {struct xhci_dwc3_platdata *plat =dev_get_platdata (dev); -dwc3_shutdown_phy (dev, plat->usb_phys); +dwc3_shutdown_phy (dev, &plat->usb_phys);return xhci_deregister (dev); }