mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-28 12:53:14 +01:00
USB: gadget: dummy-hcd: Fix wait for outstanding request completions
The dummy-hcd driver emulates synchronize_irq() by waiting until its
private callback_usage counter drops to 0 (with the private lock not
held). This counter is incremented whenever a gadget driver callback
occurs (which requires the private lock to be dropped), but not when a
request completion handler is called.
This is an oversight. Request completion is triggered by timer
interrupts (emulating device IRQs in a real UDC), and the interrupt
handlers are supposed to have completed when the synchronize_irq()
emulation routine returns -- they aren't supposed to be in the middle
of a completion callback. If this happens it can lead to a gadget
driver's unbind routine running before all outstanding request
completions have finished, maybe even allowing the gadget driver's
module to be unloaded while a completion handler is still running.
Fix the oversight by incrementing the callback_usage value across
request completion callbacks.
Link: https://lore.kernel.org/linux-usb/[email protected]/
Fixes: 7dbd8f4cab ("USB: dummy-hcd: Fix erroneous synchronization change")
Tested-by: Minseo Kim <[email protected]>
Signed-off-by: Alan Stern <[email protected]>
Cc: stable <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
1 parent
aef5a7e207
commit
b263ff9b0f
1 file changed
+4
@@ -343,9 +343,11 @@ static void dummy_giveback(struct dummy *dum, struct usb_ep *_ep,
|
||||
{
|
||||
bool fifo = req == &dum->fifo_req;
|
||||
|
||||
++dum->callback_usage;
|
||||
spin_unlock(&dum->lock);
|
||||
usb_gadget_giveback_request(_ep, &req->req);
|
||||
spin_lock(&dum->lock);
|
||||
--dum->callback_usage;
|
||||
if (fifo)
|
||||
dum->fifo_req_busy = 0;
|
||||
}
|
||||
@@ -759,11 +761,13 @@ static int dummy_queue(struct usb_ep *_ep, struct usb_request *_req,
|
||||
req->req.complete = fifo_complete;
|
||||
|
||||
list_add_tail(&req->queue, &ep->queue);
|
||||
++dum->callback_usage;
|
||||
spin_unlock(&dum->lock);
|
||||
_req->actual = _req->length;
|
||||
_req->status = 0;
|
||||
usb_gadget_giveback_request(_ep, _req);
|
||||
spin_lock(&dum->lock);
|
||||
--dum->callback_usage;
|
||||
} else
|
||||
list_add_tail(&req->queue, &ep->queue);
|
||||
spin_unlock_irqrestore(&dum->lock, flags);
|
||||
|
||||
Reference in new issue
Block a user