usb: dwc3: fix race of usb_gadget_driver operation
Subsystems (2)
PATCH 2/2 usb: dwc3: fix race of usb_gadget_driver operation
there is following race condition,
CPU1 CPU2dwc3_runtime_suspend() dwc3_gadget_stop()spin_lock(&dwc->lock)dwc3_gadget_suspend()dwc3_disconnect_gadget()dwc->gadget_driver != NULLspin_unlock(&dwc->lock)
spin_lock(&dwc->lock)
dwc->gadget_driver = NULL
spin_unlock(&dwc->lock)dwc->gadget_driver->disconnect(dwc->gadget);
system will crash when access NULL pointer.
this change will remove pointer of upper layer
struct usb_gadget_driver,
use UDC safe api to access necessary function.
Signed-off-by Linyu Yuan <[email protected]>
--- drivers/usb/dwc3/core.h | 2 -- drivers/usb/dwc3/ep0.c | 6 +---- drivers/usb/dwc3/gadget.c | 53 ++++++++++----------------------------- 3 files changed, 14 insertions(+), 47 deletions(-)
drivers/usb/dwc3/core.h +0 -2
@@ -962,7 +962,6 @@ struct dwc3_scratchpad_array {* @ev_buf: struct dwc3_event_buffer pointer * @eps: endpoint array * @gadget: device side representation of the peripheral controller -* @gadget_driver: pointer to the gadget driver * @clks: array of clocks * @num_clks: number of clocks * @reset: reset control
@@ -1108,7 +1107,6 @@ struct dwc3 {struct dwc3_ep *eps[DWC3_ENDPOINTS_NUM ];struct usb_gadget *gadget; -struct usb_gadget_driver *gadget_driver;struct clk_bulk_data *clks;int num_clks;
drivers/usb/dwc3/ep0.c +1 -5
@@ -600,7 +600,7 @@ static int dwc3_ep0_delegate_req(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)int ret;spin_unlock (&dwc->lock); - ret = dwc->gadget_driver->setup (dwc->gadget, ctrl); + ret =usb_gadget_udc_setup (dwc->gadget, ctrl);spin_lock (&dwc->lock);return ret; }
@@ -795,9 +795,6 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,int ret = -EINVAL ;u32 len; -if (!dwc->gadget_driver) - goto out; -trace_dwc3_ctrl_req (ctrl); len =le16_to_cpu (ctrl->wLength);
@@ -819,7 +816,6 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,if (ret ==USB_GADGET_DELAYED_STATUS ) dwc->delayed_status = true; -out:if (ret <0 )dwc3_ep0_stall_and_restart (dwc); }
drivers/usb/dwc3/gadget.c +13 -40
109 lines not on this page · raw message
Signature · 1 line
2.25.1