From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54283)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1XqMUh-0001M7-5c
	for qemu-devel@nongnu.org; Mon, 17 Nov 2014 08:37:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1XqMUX-0005IN-3H
	for qemu-devel@nongnu.org; Mon, 17 Nov 2014 08:37:27 -0500
Message-ID: <1416231418.608.15.camel@nilsson.home.kraxel.org>
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 17 Nov 2014 14:36:58 +0100
In-Reply-To: <5469F033.5090104@huawei.com>
References: <1416046008-7880-1-git-send-email-arei.gonglei@huawei.com>
	<1416046008-7880-10-git-send-email-arei.gonglei@huawei.com>
	<5469D4C4.5090407@redhat.com> <5469D98A.8020408@huawei.com>
	<5469F033.5090104@huawei.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 9/9] hcd-musb: fix dereference null return
	value
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gonglei <arei.gonglei@huawei.com>
Cc: "Huangweidong (C)" <weidong.huang@huawei.com>, Zhanghailiang <zhang.zhanghailiang@huawei.com>, "qemu-trivial@nongnu.org" <qemu-trivial@nongnu.org>, "mjt@tls.msk.ru" <mjt@tls.msk.ru>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "Huangpeng (Peter)" <peter.huangpeng@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>

> >> @@ -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;
> > 
> > This is a good approach, id is just a identifying. Thanks,
> > 
> 
> Let me split the patch from this series as a separate patch
> and add Paolo's signed-off-by.
> 
> Asking for Gerd's reviewing, Thanks.

Looks good to me.

cheers,
  Gerd