From nobody Sat Nov 8 07:54:01 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 1549460369739717.9318159266898; Wed, 6 Feb 2019 05:39:29 -0800 (PST) Received: from localhost ([127.0.0.1]:51105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNQ9-00068i-Mn for importer@patchew.org; Wed, 06 Feb 2019 08:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNO9-00050T-JF for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grNO8-0003m3-Ti for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:17 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:56764) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grNO8-0003lm-LI for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:16 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x16DT0Au150716; Wed, 6 Feb 2019 13:37:15 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2qd9argyps-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Feb 2019 13:37:15 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x16Db9su013189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Feb 2019 13:37:10 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x16Db9lA010149; Wed, 6 Feb 2019 13:37:09 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:09 -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=D5Pgzct5jAQOq5pVf2BGEwiQEtgXEBqNu9FKbcbQBD0=; b=kaFcsQADo71mwtq0y0+LrO3JxKA/dx6s450A9THLmqLI8/Wpak+PCFUanLV9LiwTRhyD 5SGHQfntddsef7f8vP+ORSBqEj9ontLEw7f4F3LE61MG4JYD4NxfjpPx+Hu4kWmeiSlr zCmyXBt30N1XjeqfUF0ix2peF5PutwJrkBWVW3TjCrwL1Z9P4yHtvH3Xqqfkh7nPY+Ef IjbM5wb3zYYCzMI8V0NVRFyrhDAVMoY+H6DeyyfV6vaJapePSBLitOQ7XbEyJMRsygUt QbYcuimNHkPSTUDUyS46meZyKheKkKmwASdfYcSr/91x7lsyzsgUo9y5Ze3p0D+iExge wg== From: Liam Merwick To: kraxel@redhat.com, qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 13:36:48 +0000 Message-Id: <1549460216-25808-2-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=909 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.86 Subject: [Qemu-devel] [PATCH v2 1/9] usb: rearrange 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" There is no need to calculate the 'eps' variable in usb_ep_get() if 'ep' is the control endpoint. Instead the calculation should be done after validating the input before returning an entry indexed by the endpoint 'ep'. Signed-off-by: Liam Merwick Reviewed-by: Darren Kenny Reviewed-by: Mark Kanda Reviewed-by: Ameya More --- hw/usb/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index 241ae66b1505..bfb7ae67bbf0 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -720,12 +720,12 @@ struct USBEndpoint *usb_ep_get(USBDevice *dev, int pi= d, int ep) if (dev =3D=3D NULL) { return NULL; } - eps =3D (pid =3D=3D USB_TOKEN_IN) ? dev->ep_in : dev->ep_out; if (ep =3D=3D 0) { return &dev->ep_ctl; } assert(pid =3D=3D USB_TOKEN_IN || pid =3D=3D USB_TOKEN_OUT); assert(ep > 0 && ep <=3D USB_MAX_ENDPOINTS); + eps =3D (pid =3D=3D USB_TOKEN_IN) ? dev->ep_in : dev->ep_out; return eps + ep - 1; } =20 --=20 1.8.3.1