From nobody Sun Feb 8 20:52:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862974; cv=none; d=zohomail.com; s=zohoarc; b=TM2eafdzK92WIHCT7IkrH73LYvo4rg/YpRIQfyiTxQbdFcJlkGhIXM629NOJw6hbPQB9NHmJ/YaOR1tOV30CCj6uJ/SclU+mbj78wt5Mg+5TwyEr5VdDFm9QvYR1jO4Dq8gIb2kWc3ZPkEf6fa0yah+QY8kt6trX2jBFARrfIgY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862974; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X9130wMPdkUNf8DYOJXaIxhe8PFcuZwIUBzhp+qLksQ=; b=RffE/H3r3uIvKoFvAuhccIrbMk3S7XV+c3qSA96eo8Rg19KPZJ+4h+cKvgKaDwaWTOJo+FLdoK7ihVF9hdLA2w+1nBemV6hAx+3G5sJAcITJfx7dFz+g1xrje/kWbOfmZ/+2g9r9WgydJVrF+ceIEujj+2MGLJIj2GrYXSqSNwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862974989107.65479770620209; Mon, 31 Aug 2020 01:36:14 -0700 (PDT) Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfIT-0004m1-KB for importer@patchew.org; Mon, 31 Aug 2020 04:36:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfFY-000874-Mx for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:33:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfFW-0006Zs-KG for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:33:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-225-TnNTksJqM-O78N88t1bigA-1; Mon, 31 Aug 2020 04:33:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0087E10ABDAE; Mon, 31 Aug 2020 08:33:06 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id C679C7EB72; Mon, 31 Aug 2020 08:33:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 034D97828; Mon, 31 Aug 2020 10:33:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X9130wMPdkUNf8DYOJXaIxhe8PFcuZwIUBzhp+qLksQ=; b=KX+hoF8DCDbboKsU6sbJGSD0vB6e7QzpN1TBvxuh7XkqZqVolXbWaPH1nDbnxCrpx3U0BO O0EBtaLLzLZh4mHzhyuyVo8VIqWWalexrCDVpGFhaP1XVZICwygyhH+4HhNf3SoSBCAvGs 6htIdeMEX/OXoLShLR541aaO02A/phI= X-MC-Unique: TnNTksJqM-O78N88t1bigA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 03/18] hw: ehci: check return value of 'usb_packet_map' Date: Mon, 31 Aug 2020 10:32:46 +0200 Message-Id: <20200831083301.6357-4-kraxel@redhat.com> In-Reply-To: <20200831083301.6357-1-kraxel@redhat.com> References: <20200831083301.6357-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:43:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Li Qiang , Gerd Hoffmann , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Li Qiang If 'usb_packet_map' fails, we should stop to process the usb request. Signed-off-by: Li Qiang Message-Id: <20200812161727.29412-1-liq3ea@163.com> Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 58cceacbf83a..4da446d2de6b 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1373,7 +1373,10 @@ static int ehci_execute(EHCIPacket *p, const char *a= ction) spd =3D (p->pid =3D=3D USB_TOKEN_IN && NLPTR_TBIT(p->qtd.altnext) = =3D=3D 0); usb_packet_setup(&p->packet, p->pid, ep, 0, p->qtdaddr, spd, (p->qtd.token & QTD_TOKEN_IOC) !=3D 0); - usb_packet_map(&p->packet, &p->sgl); + if (usb_packet_map(&p->packet, &p->sgl)) { + qemu_sglist_destroy(&p->sgl); + return -1; + } p->async =3D EHCI_ASYNC_INITIALIZED; } =20 @@ -1453,7 +1456,10 @@ static int ehci_process_itd(EHCIState *ehci, if (ep && ep->type =3D=3D USB_ENDPOINT_XFER_ISOC) { usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false, (itd->transact[i] & ITD_XACT_IOC) !=3D 0); - usb_packet_map(&ehci->ipacket, &ehci->isgl); + if (usb_packet_map(&ehci->ipacket, &ehci->isgl)) { + qemu_sglist_destroy(&ehci->isgl); + return -1; + } usb_handle_packet(dev, &ehci->ipacket); usb_packet_unmap(&ehci->ipacket, &ehci->isgl); } else { --=20 2.27.0