From nobody Tue Nov 11 05:00:21 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561706705; cv=none; d=zoho.com; s=zohoarc; b=e3K1hlOc1WzAhaqUNQtC8iObs8xakgwj5oMRznCWEVbMNB1+ZEVjd5BoANUy1GsSfJNPXJuReYp+PnX34uMQ5ktGJQdh8jmLfRxZIxv5oR45p8tOFMKfyF5RjXy+S2vXmLO9oZaIEVbF+pGu4d/S3LSwoJdI/zt4WAoy9Y60PeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561706705; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=UQFG+cJwUkAmd+VuqHfsnMooNIFjB79J6Wnc4jbPgFg=; b=lVqZlA4pA2FCdxXmg4JapRJn7Ay4R1n/1q9v5PnCtlJjodQ0To4VjxtFxcCnjOSXb2g9udUdsZ32kHGHjLGSP+BLCKrceHmNKo/jFHBZHZ14s98LnzCW3wSzAhsfc5I/fTVQqKfTGkxtc/rXaNjfO5G98EyRVHZ/F4rAEa5a4U8= ARC-Authentication-Results: i=1; mx.zoho.com; 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 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 1561706705757158.94585349649037; Fri, 28 Jun 2019 00:25:05 -0700 (PDT) Received: from localhost ([::1]:57336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hglFN-00083S-Pd for importer@patchew.org; Fri, 28 Jun 2019 03:24:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47803) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hglEs-0007eu-IQ for qemu-devel@nongnu.org; Fri, 28 Jun 2019 03:24:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hglEr-0004Us-Ga for qemu-devel@nongnu.org; Fri, 28 Jun 2019 03:24:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hglEr-0004RI-A0 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 03:24:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E09F308FBAC for ; Fri, 28 Jun 2019 07:24:03 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-96.ams2.redhat.com [10.36.116.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57D8C6013A; Fri, 28 Jun 2019 07:23:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AB30811AA3; Fri, 28 Jun 2019 09:23:57 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 09:23:57 +0200 Message-Id: <20190628072357.31782-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 28 Jun 2019 07:24:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] virtio-gpu: fix unmap in error path 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: Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We land here in case not everything we've asked for could be mapped. So unmap only the bytes which have actually been mapped. Also we didn't access anything, so acces_len can be 0. Reported-by: Laszlo Ersek Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Reviewed-by: Li Qiang --- hw/display/virtio-gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 2b0f66b1d68d..475a018c027c 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1048,9 +1048,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,= size_t size, if (res->iov[i].iov_base) { dma_memory_unmap(VIRTIO_DEVICE(g)->dma_as, res->iov[i].iov_base, - res->iov[i].iov_len, + len, DMA_DIRECTION_TO_DEVICE, - res->iov[i].iov_len); + 0); } /* ...and the mappings for previous loop iterations */ res->iov_cnt =3D i; --=20 2.18.1