From nobody Fri May 17 05:50:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1598500862; cv=none; d=zohomail.com; s=zohoarc; b=CMgUxcLSQt4y/xoGYza/E+u/N3sguNux7k0At6kUjY+VlDwiKQr7mZNa9b0hgaH3JWquilWZR2oe3CXuJUNYS3S70jrIO+K9Cew6pcJpYSzsn6Un4n3GPIv8jzEElPOufGEItoTVGRHkVs6z8OWJoGwU3NBXvuxnUpOWL6pzuT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598500862; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=7PleswxTRhcf6VogOPEt9zup5pEEuMKH4wZMMEIDLi8=; b=KCD2DMyTn+Rj0P9Tt4EHUvsS++bQMM/MnaMctF6nc2BTIaELE7AvzORdaCiu1aZpjfaQwW64YuJFjzzk6JN7KXWd5OcoexPOIIWI3itap0HO+bbDKrvpvYySW5IV4RSQEn6m5XG/KroTKfUgbwQBQ6bvETDrlVLGoLpF48yoIdk= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598500862548483.3249205682705; Wed, 26 Aug 2020 21:01:02 -0700 (PDT) Received: from localhost ([::1]:55388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kB95w-00073J-7H for importer@patchew.org; Thu, 27 Aug 2020 00:01:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kB94y-0006VE-M5 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 00:00:00 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:51412 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kB94w-0004dl-Oh for qemu-devel@nongnu.org; Thu, 27 Aug 2020 00:00:00 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Aug 2020 11:59:55 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id C98DD48990D9; Thu, 27 Aug 2020 11:59:53 +0800 (CST) Received: from G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.203) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 27 Aug 2020 11:59:54 +0800 Received: from FNSTPC.g08.fujitsu.local (10.167.226.45) by G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 27 Aug 2020 11:59:53 +0800 X-IronPort-AV: E=Sophos;i="5.76,358,1592841600"; d="scan'208";a="98605503" From: Li Zhijian To: , Subject: [PATCH v3] virtio-gpu: fix unmap the already mapped items Date: Thu, 27 Aug 2020 11:58:55 +0800 Message-ID: <20200827035855.24354-1-lizhijian@cn.fujitsu.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-yoursite-MailScanner-ID: C98DD48990D9.ACF94 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lizhijian@cn.fujitsu.com 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: none client-ip=183.91.158.132; envelope-from=lizhijian@cn.fujitsu.com; helo=heian.cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 23:41:38 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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: Li Qiang , qemu-devel@nongnu.org, Li Zhijian Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" we go here either (!(*iov)[i].iov_base) or (len !=3D l), so we need to cons= ider to unmap the 'i'th item as well when the 'i'th item is not nil CC: Li Qiang Signed-off-by: Li Zhijian --- v2: address Gerd's comments v3: leave (*iov)[i].iov_len as the real mapped len (Li Qiang) --- hw/display/virtio-gpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5f0dd7c150..90be4e3ed7 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -646,9 +646,9 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, uint64_t a =3D le64_to_cpu(ents[i].addr); uint32_t l =3D le32_to_cpu(ents[i].length); hwaddr len =3D l; - (*iov)[i].iov_len =3D l; (*iov)[i].iov_base =3D dma_memory_map(VIRTIO_DEVICE(g)->dma_as, a, &len, DMA_DIRECTION_TO_DEVI= CE); + (*iov)[i].iov_len =3D len; if (addr) { (*addr)[i] =3D a; } @@ -656,6 +656,9 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g, qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map MMIO memory = for" " resource %d element %d\n", __func__, ab->resource_id, i); + if ((*iov)[i].iov_base) { + i++; /* cleanup the 'i'th map */ + } virtio_gpu_cleanup_mapping_iov(g, *iov, i); g_free(ents); *iov =3D NULL; --=20 2.28.0