iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: ehci-tegra: fix inefficient copy of unaligned buffers

Browse Source 
Make sure only to copy any actual data rather than the whole buffer,
when releasing the temporary buffer used for unaligned non-isochronous
transfers.

Compile-tested only.

Signed-off-by: Johan Hovold <johan@kernel.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2015-04-23 16:06:51 +02:00 committed by Greg Kroah-Hartman
parent 8ca9a3217f
commit 0efd937e27
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/usb/host/ehci-tegra.c
View File

@ -304,6 +304,7 @@ struct dma_aligned_buffer {
static void free_dma_aligned_buffer(struct urb *urb) static void free_dma_aligned_buffer(struct urb *urb)
{ {
struct dma_aligned_buffer *temp; struct dma_aligned_buffer *temp;
size_t length;
if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER)) if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
return; return;
@ -311,9 +312,14 @@ static void free_dma_aligned_buffer(struct urb *urb)
temp = container_of(urb->transfer_buffer, temp = container_of(urb->transfer_buffer,
struct dma_aligned_buffer, data); struct dma_aligned_buffer, data);
if (usb_urb_dir_in(urb)) if (usb_urb_dir_in(urb)) {
memcpy(temp->old_xfer_buffer, temp->data, if (usb_pipeisoc(urb->pipe))
urb->transfer_buffer_length); length = urb->transfer_buffer_length;
else
length = urb->actual_length;
memcpy(temp->old_xfer_buffer, temp->data, length);
}
urb->transfer_buffer = temp->old_xfer_buffer; urb->transfer_buffer = temp->old_xfer_buffer;
kfree(temp->kmalloc_ptr); kfree(temp->kmalloc_ptr);