From nobody Sat Nov 8 07:55:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549460655338398.48374159426396; Wed, 6 Feb 2019 05:44:15 -0800 (PST) Received: from localhost ([127.0.0.1]:51178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNUn-0001oS-AM for importer@patchew.org; Wed, 06 Feb 2019 08:44:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNOi-0005SP-Im for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grNOd-0003rM-8c for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:49 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:36556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grNOZ-0003nf-8X for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:44 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x16DSvs9155867; Wed, 6 Feb 2019 13:37:24 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2qd98n907b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Feb 2019 13:37:24 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x16DbI7f009123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Feb 2019 13:37:18 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x16DbHDL005998; Wed, 6 Feb 2019 13:37:17 GMT Received: from ol7.nl.oracle.com (/10.175.12.46) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 06 Feb 2019 05:37:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=usqO3XwgA5gAFlG1R7udBZbzu/JePWdIEr/oU4ZH1GI=; b=5SYzcoG7GT3QJraJu3qhDeNmfIuoXkevmwWmgI9gSMrhiFumqKNbeoH+TaZZZZMMYGQA 032u526T4bFGuH1ndUNrxPmArbbZ0E6R0Tr0aHwmOu4zQ4KwD/1xVmAG9ymguvtBTocr i9Lo4f7Bfwe1AcpBMJMj1cmuSFJ7w2LHGRVtqVoupRof2dKI2iHv98hNt7hnSwtHCm7q vrtz7W1XoowtJd+j1BNoMnlT5oPLl1w8Y8jjSTLEiompn0uUp6mE1e1VfXK3W3DtXdt9 p+vUnQVDH02sR6s48mK5Oryq9tuJEkMgcx/hgSbdIy1DQzSqA4lfbiyyHcD0yJX0851X /A== From: Liam Merwick To: kraxel@redhat.com, qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 13:36:54 +0000 Message-Id: <1549460216-25808-8-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549460216-25808-1-git-send-email-liam.merwick@oracle.com> References: <1549460216-25808-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9158 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=937 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902060107 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH v2 7/9] usb: check device is not NULL before calling usb_ep_get() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: darren.kenny@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In musb_packet(), the call to usb_find_device() can return NULL if it doesn't find a device matching 'addr' so explicitly check the return value before passing it to usb_ep_get(). This then allows the subsequent calculation of 'id' to be streamlined. Signed-off-by: Liam Merwick --- hw/usb/hcd-musb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index d70a91a58ce2..85d779655498 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -628,11 +628,11 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *e= p, =20 /* A wild guess on the FADDR semantics... */ dev =3D usb_find_device(&s->port, ep->faddr[idx]); - uep =3D usb_ep_get(dev, pid, ep->type[idx] & 0xf); - id =3D pid; - if (uep) { - id |=3D (dev->addr << 16) | (uep->nr << 8); + if (dev =3D=3D NULL) { + return; } + uep =3D usb_ep_get(dev, pid, ep->type[idx] & 0xf); + id =3D pid | (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 =3D ep; --=20 1.8.3.1