Commit b37a6dfe authored Apr 08, 2016 by Lu Baolu Committed by Sasha Levin Apr 20, 2016

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>

parent f1aa53dc

drivers/usb/host/xhci-mem.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1883,6 +1883,12 @@ no_bw:
	kfree(xhci->rh_bw);		kfree(xhci->rh_bw);
	kfree(xhci->ext_caps);		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_size = 0;
	xhci->page_shift = 0;		xhci->page_shift = 0;
	xhci->bus_state[0].bus_suspended = 0;		xhci->bus_state[0].bus_suspended = 0;