Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c207e7c5 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Fix null pointer dereference if xhci initialization fails 



If xhci initialization fails before the roothub bandwidth
domains (xhci->rh_bw[i]) are allocated it will oops when
trying to access rh_bw members in xhci_mem_cleanup().

Reported-by: default avatarManuel Reimer <manuel.reimer@gmx.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c66f1c62

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	xhci_cleanup_command_queue(xhci);



	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);

	for (i = 0; i < num_ports; i++) {

	for (i = 0; i < num_ports && xhci->rh_bw; i++) {

		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;

		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {

			struct list_head *ep = &bwt->interval_bw[j].endpoints;