diff options
author | Lu Baolu <baolu.lu@linux.intel.com> | 2016-04-08 16:25:09 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-20 09:41:05 -0400 |
commit | b37a6dfe19c77bbdf063679ab3b28c8b13282189 (patch) | |
tree | 2d6e0d915cec41970365b613104207be6bd433d8 /drivers | |
parent | f1aa53dc77f70a97a879b97990fb07b1c6e8ef57 (diff) |
usb: xhci: fix wild pointers in xhci_mem_cleanup
[ Upstream commit 71504062a7c34838c3fccd92c447f399d3cb5797 ]
This patch fixes some wild pointers produced by xhci_mem_cleanup.
These wild pointers will cause system crash if xhci_mem_cleanup()
is called twice.
Reported-and-tested-by: Pengcheng Li <lpc.li@hisilicon.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/xhci-mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index ce3087bd95d2..150cab3290f8 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -1883,6 +1883,12 @@ no_bw: kfree(xhci->rh_bw); kfree(xhci->ext_caps); + xhci->usb2_ports = NULL; + xhci->usb3_ports = NULL; + xhci->port_array = NULL; + xhci->rh_bw = NULL; + xhci->ext_caps = NULL; + xhci->page_size = 0; xhci->page_shift = 0; xhci->bus_state[0].bus_suspended = 0; |