evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: octeon-usb: fix unaligned isochronous transfers

Browse source 
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>
This commit is contained in:
Johan Hovold 2015-04-23 16:06:52 +02:00 • committed by Greg Kroah-Hartman
parent b787f68c36
commit b97c3c1a0b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/octeon-usb/octeon-hcd.c
View 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) static void octeon_free_temp_buffer(struct urb *urb)
{ {
struct octeon_temp_buffer *temp; struct octeon_temp_buffer *temp;
size_t length;
if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER)) if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
return; return;
temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer, temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer,
data); data);
if (usb_urb_dir_in(urb)) if (usb_urb_dir_in(urb)) {
memcpy(temp->orig_buffer, urb->transfer_buffer, if (usb_pipeisoc(urb->pipe))
urb->actual_length); 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_buffer = temp->orig_buffer;
urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER; urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
kfree(temp); kfree(temp);