diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-01-17 10:32:16 -0500 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-01-24 09:53:38 -0800 |
| commit | 48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24 (patch) | |
| tree | 3e35219eabc2ff92fb2b29b3f5457c1daf03d39f /drivers/usb | |
| parent | ba7b5c22d33136a5612ca5ef8d31564dcc501126 (diff) | |
| download | linux-3.10-48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24.tar.gz linux-3.10-48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24.tar.bz2 linux-3.10-48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24.zip | |
USB: XHCI: fix memory leak of URB-private data
This patch (as1640) fixes a memory leak in xhci-hcd. The urb_priv
data structure isn't always deallocated in the handle_tx_event()
routine for non-control transfers. The patch adds a kfree() call so
that all paths end up freeing the memory properly.
This patch should be backported to kernels as old as 2.6.36, that
contain the commit 8e51adccd4c4b9ffcd509d7f2afce0a906139f75 "USB: xHCI:
Introduce urb_priv structure"
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Reported-and-tested-by: Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
CC: <stable@vger.kernel.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 151204642a6..7f76a49e90d 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2589,6 +2589,8 @@ cleanup: (trb_comp_code != COMP_STALL && trb_comp_code != COMP_BABBLE)) xhci_urb_free_priv(xhci, urb_priv); + else + kfree(urb_priv); usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb); if ((urb->actual_length != urb->transfer_buffer_length && |