Skip to content

Commit

Permalink
staging: usbip: Fix deadlock
Browse files Browse the repository at this point in the history
When detaching a port from the client side (usbip --detach 0),
the event thread, on the server side, is going to deadlock.
The "eh" server thread is getting USBIP_EH_RESET event and calls:
  -> stub_device_reset() -> usb_reset_device()
the USB framework is then calling back _in the same "eh" thread_ :
  -> stub_disconnect() -> usbip_stop_eh() -> wait_for_completion()
the "eh" thread is being asleep forever, waiting for its own completion.
This patch checks if "eh" is the current thread, in usbip_stop_eh().

Signed-off-by: Eric Lescouet <eric@lescouet.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Eric Lescouet authored and Greg Kroah-Hartman committed Apr 30, 2010
1 parent c008758 commit d01f42a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/staging/usbip/usbip_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ void usbip_stop_eh(struct usbip_device *ud)
{
struct usbip_task *eh = &ud->eh;

if (eh->thread == current)
return; /* do not wait for myself */

wait_for_completion(&eh->thread_done);
usbip_dbg_eh("usbip_eh has finished\n");
}
Expand Down

0 comments on commit d01f42a

Please sign in to comment.