Make sure only to copy any actual data rather than the whole buffer,
when releasing the temporary buffer used for unaligned transfer buffers.
Note that this also fixes a lockup on disconnect, where repeated failed
transfers would starve the hub workqueue from processing the disconnect,
which would have prevented the urbs from being resubmitted. In this case
there is no data to forward, but the full buffer length was being copied
nonetheless.
The disconnect lockup can easily be reproduced using four unaligned
4k-bulk-in urbs on Beaglebone Black.
Fixes: 8408fd1d83e3 ("usb: musb: implement (un)map_urb_for_dma hooks")
Cc: stable <stable@xxxxxxxxxxxxxxx> # v3.10
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
---
drivers/usb/musb/musb_host.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index c3d5fc9dfb5b..d8327ec19a1f 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2523,7 +2523,7 @@ static void musb_free_temp_buffer(struct urb *urb)
if (dir == DMA_FROM_DEVICE) {
memcpy(temp->old_xfer_buffer, temp->data,
- urb->transfer_buffer_length);
+ urb->actual_length);
}
urb->transfer_buffer = temp->old_xfer_buffer;
kfree(temp->kmalloc_ptr);
--
2.0.5
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html