]> git.itanic.dy.fi Git - linux-stable/commit
xhci: update bounce buffer with correct sg num
authorHenry Lin <henryl@nvidia.com>
Wed, 22 May 2019 11:33:57 +0000 (14:33 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 May 2019 12:25:36 +0000 (14:25 +0200)
commit597c56e372dab2c7f79b8d700aad3a5deebf9d1b
treea85fb16b22e75348bf625bd06633145022c1d415
parent45457c01171fd1488a7000d1751c06ed8560ee38
xhci: update bounce buffer with correct sg num

This change fixes a data corruption issue occurred on USB hard disk for
the case that bounce buffer is used during transferring data.

While updating data between sg list and bounce buffer, current
implementation passes mapped sg number (urb->num_mapped_sgs) to
sg_pcopy_from_buffer() and sg_pcopy_to_buffer(). This causes data
not get copied if target buffer is located in the elements after
mapped sg elements. This change passes sg number for full list to
fix issue.

Besides, for copying data from bounce buffer, calling dma_unmap_single()
on the bounce buffer before copying data to sg list can avoid cache issue.

Fixes: f9c589e142d0 ("xhci: TD-fragment, align the unsplittable case with a bounce buffer")
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: Henry Lin <henryl@nvidia.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-ring.c