svn commit: r303349 - head/usr.sbin/bhyve

[Peter Grehan]

Author: grehan
Date: Tue Jul 26 23:40:25 2016
New Revision: 303349
URL: https://svnweb.freebsd.org/changeset/base/303349

Log:
  Catch another case where an XHCI interrupt was being
  injected without state being set up.
  
  This fixes a core dump when dropping to the UEFI prompt
  with graphics enabled and moving the mouse around.
  
  Discussed with:	Leon Dang
  MFC after:	3 days

Modified:
  head/usr.sbin/bhyve/pci_xhci.c

Modified: head/usr.sbin/bhyve/pci_xhci.c
==============================================================================
--- head/usr.sbin/bhyve/pci_xhci.c	Tue Jul 26 23:29:37 2016	(r303348)
+++ head/usr.sbin/bhyve/pci_xhci.c	Tue Jul 26 23:40:25 2016	(r303349)
@@ -2559,7 +2559,8 @@ pci_xhci_dev_intr(struct usb_hci *hci, i
 
 	/* check if device is ready; OS has to initialise it */
 	if (sc->rtsregs.erstba_p == NULL ||
-	    (sc->opregs.usbcmd & XHCI_CMD_RS) == 0)
+	    (sc->opregs.usbcmd & XHCI_CMD_RS) == 0 ||
+	    dev->dev_ctx == NULL)
 		return (0);
 
 	p = XHCI_PORTREG_PTR(sc, hci->hci_port);