From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPnP-00048m-CZ for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPnG-0006CI-6o for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:59 -0500 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:53501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPnG-0006CD-04 for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:50 -0500 Received: by mail-wg0-f46.google.com with SMTP id x13so25619196wgg.33 for ; Mon, 17 Nov 2014 09:08:49 -0800 (PST) Received: from playground.station (net-37-117-142-149.cust.vodafonedsl.it. [37.117.142.149]) by mx.google.com with ESMTPSA id fm10sm21789207wjc.43.2014.11.17.09.08.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 09:08:48 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Nov 2014 18:08:19 +0100 Message-Id: <1416244099-7217-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> References: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 12/12] hcd-musb: fix dereference null return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org usb_ep_get and usb_handle_packet can deal with a NULL device, but we have to avoid dereferencing NULL pointers when building the id. Thanks to Gonglei for an initial stab at fixing this. Signed-off-by: Paolo Bonzini --- hw/usb/hcd-musb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 66bc61a..40809f6 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -608,6 +608,7 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, USBDevice *dev; USBEndpoint *uep; int idx = epnum && dir; + int id; int ttype; /* ep->type[0,1] contains: @@ -625,8 +626,11 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, /* A wild guess on the FADDR semantics... */ dev = usb_find_device(&s->port, ep->faddr[idx]); uep = usb_ep_get(dev, pid, ep->type[idx] & 0xf); - usb_packet_setup(&ep->packey[dir].p, pid, uep, 0, - (dev->addr << 16) | (uep->nr << 8) | pid, false, true); + id = pid; + if (uep) { + id |= (dev->addr << 16) | (uep->nr << 8); + } + usb_packet_setup(&ep->packey[dir].p, pid, uep, 0, id, false, true); usb_packet_addbuf(&ep->packey[dir].p, ep->buf[idx], len); ep->packey[dir].ep = ep; ep->packey[dir].dir = dir; -- 1.8.3.1