diff options
| author | Lu Baolu <baolu.lu@linux.intel.com> | 2017-10-05 11:21:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-05 11:01:57 +0200 |
| commit | cd3f1790b006d91786728c20a01da21ee277aff1 (patch) | |
| tree | 6f04399ab0089e40532cb86cf755b00490ebc172 /drivers/usb/host/xhci-hub.c | |
| parent | b64149ca016c25f30b39ac5a8f37cfb9017e19bb (diff) | |
| download | linux-riscv-cd3f1790b006d91786728c20a01da21ee277aff1.tar.gz linux-riscv-cd3f1790b006d91786728c20a01da21ee277aff1.tar.bz2 linux-riscv-cd3f1790b006d91786728c20a01da21ee277aff1.zip | |
usb: xhci: Fix potential memory leak in xhci_disable_slot()
xhci_disable_slot() allows the invoker to pass a command pointer
as paramenter. Otherwise, it will allocate one. This will cause
memory leak when a command structure was allocated inside of this
function while queuing command trb fails. Another problem comes up
when the invoker passed a command pointer, but xhci_disable_slot()
frees it when it detects a dead host.
This patch fixes these two problems by removing the command parameter
from xhci_disable_slot().
Fixes: f9e609b82479 ("usb: xhci: Add helper function xhci_disable_slot().")
Cc: Guoqing Zhang <guoqing.zhang@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-hub.c')
| -rw-r--r-- | drivers/usb/host/xhci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index f0ae9df7cbef..e35903dc2775 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -615,7 +615,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci, if (!xhci->devs[i]) continue; - retval = xhci_disable_slot(xhci, NULL, i); + retval = xhci_disable_slot(xhci, i); if (retval) xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n", i, retval); |