staging: octeon-usb: fix unaligned isochronous transfers
authorJohan Hovold <johan@kernel.org>
Thu, 23 Apr 2015 14:06:52 +0000 (16:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Apr 2015 11:14:21 +0000 (13:14 +0200)
Make sure to copy the whole transfer buffer when releasing the temporary
buffer used for unaligned isochronous transfers as the data is not
necessarily contiguous in that case.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/octeon-usb/octeon-hcd.c

index 9e5476e352b4b3ca3c0f8175883324c769c7a664..cdb0981be2e973253ae69543d919f6b48e38e3b7 100644 (file)
@@ -499,15 +499,21 @@ static int octeon_alloc_temp_buffer(struct urb *urb, gfp_t mem_flags)
 static void octeon_free_temp_buffer(struct urb *urb)
 {
        struct octeon_temp_buffer *temp;
+       size_t length;
 
        if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
                return;
 
        temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer,
                            data);
-       if (usb_urb_dir_in(urb))
-               memcpy(temp->orig_buffer, urb->transfer_buffer,
-                      urb->actual_length);
+       if (usb_urb_dir_in(urb)) {
+               if (usb_pipeisoc(urb->pipe))
+                       length = urb->transfer_buffer_length;
+               else
+                       length = urb->actual_length;
+
+               memcpy(temp->orig_buffer, urb->transfer_buffer, length);
+       }
        urb->transfer_buffer = temp->orig_buffer;
        urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
        kfree(temp);