aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci-ring.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-01-17 10:32:16 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-11 08:16:49 -0800
commitb9094c6a669409df59b04105d7d257026c78cbba (patch)
tree0404a12bbd979b83915dbd84190934dddc16e480 /drivers/usb/host/xhci-ring.c
parent85b9c6b4d04c753deb257c849cd0b1f9ce0d5c4e (diff)
downloadkernel_samsung_smdk4412-b9094c6a669409df59b04105d7d257026c78cbba.zip
kernel_samsung_smdk4412-b9094c6a669409df59b04105d7d257026c78cbba.tar.gz
kernel_samsung_smdk4412-b9094c6a669409df59b04105d7d257026c78cbba.tar.bz2
USB: XHCI: fix memory leak of URB-private data
commit 48c3375c5f69b1c2ef3d1051a0009cb9bce0ce24 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
-rw-r--r--drivers/usb/host/xhci-ring.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index edf59ee..cb436fe1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2506,6 +2506,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 &&