From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoZcW-00005o-Kf for qemu-devel@nongnu.org; Wed, 12 Nov 2014 10:14:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoZcN-0004xi-M0 for qemu-devel@nongnu.org; Wed, 12 Nov 2014 10:14:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoZcN-0004xU-Dw for qemu-devel@nongnu.org; Wed, 12 Nov 2014 10:13:59 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sACFDvlw014264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 12 Nov 2014 10:13:58 -0500 From: Gerd Hoffmann Date: Wed, 12 Nov 2014 16:13:52 +0100 Message-Id: <1415805233-9050-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1415805233-9050-1-git-send-email-kraxel@redhat.com> References: <1415805233-9050-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL for-2.2 2/3] xhci: add sanity checks to xhci_lookup_uport List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Also catch xhci_lookup_uport failures in post_load. https://bugzilla.redhat.com/show_bug.cgi?id=1074219 Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 2930b72..9a942cf 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2262,6 +2262,9 @@ static USBPort *xhci_lookup_uport(XHCIState *xhci, uint32_t *slot_ctx) int i, pos, port; port = (slot_ctx[1]>>16) & 0xFF; + if (port < 1 || port > xhci->numports) { + return NULL; + } port = xhci->ports[port-1].uport->index+1; pos = snprintf(path, sizeof(path), "%d", port); for (i = 0; i < 5; i++) { @@ -3706,6 +3709,12 @@ static int usb_xhci_post_load(void *opaque, int version_id) xhci_mask64(ldq_le_pci_dma(pci_dev, dcbaap + 8 * slotid)); xhci_dma_read_u32s(xhci, slot->ctx, slot_ctx, sizeof(slot_ctx)); slot->uport = xhci_lookup_uport(xhci, slot_ctx); + if (!slot->uport) { + /* should not happen, but may trigger on guest bugs */ + slot->enabled = 0; + slot->addressed = 0; + continue; + } assert(slot->uport && slot->uport->dev); for (epid = 1; epid <= 31; epid++) { -- 1.8.3.1