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

Commit d94c05e3 authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: xhci: Fix bug memory free after failed initialization. 



If the xHCI driver fails during the memory initialization, xhci->ir_set
may not be a valid pointer.  Check that it points to valid DMA'able memory
before writing to that address during the memory freeing process.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 051522bb

drivers/usb/host/xhci-mem.c

+5 −3
Original line number Diff line number Diff line
@@ -802,9 +802,11 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	int i;



	/* Free the Event Ring Segment Table and the actual Event Ring */

	if (xhci->ir_set) {

		xhci_writel(xhci, 0, &xhci->ir_set->erst_size);

		xhci_write_64(xhci, 0, &xhci->ir_set->erst_base);

		xhci_write_64(xhci, 0, &xhci->ir_set->erst_dequeue);

	}

	size = sizeof(struct xhci_erst_entry)*(xhci->erst.num_entries);

	if (xhci->erst.entries)

		pci_free_consistent(pdev, size,