Skip to content

Commit

Permalink
usb: xhci: fix wild pointers in xhci_mem_cleanup
Browse files Browse the repository at this point in the history
[ Upstream commit 7150406 ]

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>
  • Loading branch information
LuBaolu authored and sashalevin committed Apr 20, 2016
1 parent 1edb54d commit bd713f9
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/usb/host/xhci-mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1879,6 +1879,12 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
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;
Expand Down

0 comments on commit bd713f9

Please sign in to comment.