From: Lu Baolu <baolu.lu@linux.intel.com>
Date: Fri, 8 Apr 2016 13:25:09 +0000 (+0300)
Subject: usb: xhci: fix wild pointers in xhci_mem_cleanup
X-Git-Tag: v4.1.12-92~150^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48489a22711524be91c66b669a0b0b101570a195;p=users%2Fjedix%2Flinux-maple.git

usb: xhci: fix wild pointers in xhci_mem_cleanup

Orabug: 23331178

[ 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>
(cherry picked from commit bd713f99caa8c08b9bbc57f7c19eefc2eca25fde)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 41f841fa6c4d..5ab70afd5624 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1879,6 +1879,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;