mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-18 19:27:13 +00:00
usb: gadget: mv_u3d_core: fix violation of locking discipline in mv_u3d_ep_disable()
mv_u3d_nuke() expects to be calles with ep->u3d->lock held, because mv_u3d_done() does. But mv_u3d_ep_disable() calls it without lock that can lead to unpleasant consequences. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
272b98c645
commit
2389df458b
@ -645,6 +645,7 @@ static int mv_u3d_ep_disable(struct usb_ep *_ep)
|
|||||||
struct mv_u3d_ep *ep;
|
struct mv_u3d_ep *ep;
|
||||||
struct mv_u3d_ep_context *ep_context;
|
struct mv_u3d_ep_context *ep_context;
|
||||||
u32 epxcr, direction;
|
u32 epxcr, direction;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
if (!_ep)
|
if (!_ep)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -661,7 +662,9 @@ static int mv_u3d_ep_disable(struct usb_ep *_ep)
|
|||||||
direction = mv_u3d_ep_dir(ep);
|
direction = mv_u3d_ep_dir(ep);
|
||||||
|
|
||||||
/* nuke all pending requests (does flush) */
|
/* nuke all pending requests (does flush) */
|
||||||
|
spin_lock_irqsave(&u3d->lock, flags);
|
||||||
mv_u3d_nuke(ep, -ESHUTDOWN);
|
mv_u3d_nuke(ep, -ESHUTDOWN);
|
||||||
|
spin_unlock_irqrestore(&u3d->lock, flags);
|
||||||
|
|
||||||
/* Disable the endpoint for Rx or Tx and reset the endpoint type */
|
/* Disable the endpoint for Rx or Tx and reset the endpoint type */
|
||||||
if (direction == MV_U3D_EP_DIR_OUT) {
|
if (direction == MV_U3D_EP_DIR_OUT) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user