From nobody Fri May 17 05:26:29 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=1598009696; cv=none; d=zohomail.com; s=zohoarc; b=L5iGz1Q2wk0VA/icNzEywYIwHb3OlOSzU8cZb6gBQNfxIJiSEwP/QhjoucgHx8pB6GcMyyvFWzG9lI45+gLaLUvu5lQbMWbUse9q0ncwlJJzLAW5zkNSqhu5ZISVAw0PHez9TLgTPxQIKsAE/6H4Bqq4USXRzTD4f1tH3+rXFKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598009696; 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=rQG5TPxEdRFVv/Q+TDBN2M1Uj60KHcquJyu3VHT0q4o=; b=fyLyJXq7RGcB0wQ3QnF50EYeWK1EegHNT+2QcyEj80bPXj78FLCtRc+rrUCQ+hScKqWK9KqB6/h/V5e5TJEp4VrW845ABGvlMIM9WW8Ss2oF5kT9WRb+9Ch62KGhso5R/CUFRkbupfq9I0Lxi0qrNZqiqWlqu845c7uuubIRL0M= 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 1598009696759492.70354655348933; Fri, 21 Aug 2020 04:34:56 -0700 (PDT) Received: from localhost ([::1]:55438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k95Ju-00063r-DM for importer@patchew.org; Fri, 21 Aug 2020 07:34:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k94Zq-0006iu-HU for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:47:18 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:15581 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k94Zo-0004fk-Hl for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:47:18 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Aug 2020 18:47:13 +0800 Received: from G08CNEXMBPEKD05.g08.fujitsu.local (unknown [10.167.33.204]) by cn.fujitsu.com (Postfix) with ESMTP id 4F59D48990CB; Fri, 21 Aug 2020 18:47:11 +0800 (CST) Received: from G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.203) by G08CNEXMBPEKD05.g08.fujitsu.local (10.167.33.204) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 21 Aug 2020 18:47:12 +0800 Received: from G08FNSTD190042.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; Fri, 21 Aug 2020 18:47:12 +0800 X-IronPort-AV: E=Sophos;i="5.76,335,1592841600"; d="scan'208";a="98388759" From: Li Zhijian To: "Michael S. Tsirkin" , Gerd Hoffmann Subject: [PATCH v2] virtio-gpu: fix unmap the already mapped items Date: Fri, 21 Aug 2020 18:47:08 +0800 Message-ID: <20200821104708.4632-1-lizhijian@cn.fujitsu.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-yoursite-MailScanner-ID: 4F59D48990CB.AB4FB 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/21 03:09:06 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: 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 Signed-off-by: Li Zhijian --- v2: address Gerd's comments --- hw/display/virtio-gpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5f0dd7c150..e93f99932a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -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.17.1