usbip: Fix error path of vhci_recv_ret_submit()
commit aabb5b8338
upstream.
If a transaction error happens in vhci_recv_ret_submit(), event
handler closes connection and changes port status to kick hub_event.
Then hub tries to flush the endpoint URBs, but that causes infinite
loop between usb_hub_flush_endpoint() and vhci_urb_dequeue() because
"vhci_priv" in vhci_urb_dequeue() was already released by
vhci_recv_ret_submit() before a transmission error occurred. Thus,
vhci_urb_dequeue() terminates early and usb_hub_flush_endpoint()
continuously calls vhci_urb_dequeue().
The root cause of this issue is that vhci_recv_ret_submit()
terminates early without giving back URB when transaction error
occurs in vhci_recv_ret_submit(). That causes the error URB to still
be linked at endpoint list without “vhci_priv".
So, in the case of transaction error in vhci_recv_ret_submit(),
unlink URB from the endpoint, insert proper error code in
urb->status and give back URB.
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
Cc: stable <stable@vger.kernel.org>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20191213023055.19933-3-suwan.kim027@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dbfc29c2c7
commit
8bbc1a734e
|
@ -77,16 +77,21 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
|
||||||
usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);
|
usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);
|
||||||
|
|
||||||
/* recv transfer buffer */
|
/* recv transfer buffer */
|
||||||
if (usbip_recv_xbuff(ud, urb) < 0)
|
if (usbip_recv_xbuff(ud, urb) < 0) {
|
||||||
return;
|
urb->status = -EPROTO;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
/* recv iso_packet_descriptor */
|
/* recv iso_packet_descriptor */
|
||||||
if (usbip_recv_iso(ud, urb) < 0)
|
if (usbip_recv_iso(ud, urb) < 0) {
|
||||||
return;
|
urb->status = -EPROTO;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
/* restore the padding in iso packets */
|
/* restore the padding in iso packets */
|
||||||
usbip_pad_iso(ud, urb);
|
usbip_pad_iso(ud, urb);
|
||||||
|
|
||||||
|
error:
|
||||||
if (usbip_dbg_flag_vhci_rx)
|
if (usbip_dbg_flag_vhci_rx)
|
||||||
usbip_dump_urb(urb);
|
usbip_dump_urb(urb);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue