From nobody Sun Feb 8 22:58:07 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=1588254152; cv=none; d=zohomail.com; s=zohoarc; b=FDdYeEBMmpwTkIqK3omO4NlyhRHUvaeuhEq36qme8ATCKKCChU17jFgX+Z+jBQGppQ/A9TGefbck2KLCIpo9ljyEBb65ZmD+4VPaTztyTcWe0V86TftjESS+ZaOlwQLyn6d18NpZTwliW7eplXdhFIOGZcRzeeILalRYFmTzfX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588254152; 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=KcFDP/ksCSb7a8hsuYkhAgmErquzGZ1XAxrWAYD/CyQ=; b=Gs3Q+uCX6A22QOj50qyt3BSDkWY3O8jS88gQK7bcQ0YgXz6T2ZDgl3YLIf3Rp66NersY0Ifb9LfnUaJy0l9nRWWPXKmLzi8mUhVTndvJgbMIfR2e+0JxeI6a6bnqM2BUViS24cYUY6onGYBNDgcORKHypDxIFqOxFVoAS1hWojI= 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 1588254152988564.8283079501286; Thu, 30 Apr 2020 06:42:32 -0700 (PDT) Received: from localhost ([::1]:50090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU9SR-0007Mx-MB for importer@patchew.org; Thu, 30 Apr 2020 09:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47714) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU9KR-0007yH-JU for qemu-devel@nongnu.org; Thu, 30 Apr 2020 09:37:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU9Gh-00047T-Ig for qemu-devel@nongnu.org; Thu, 30 Apr 2020 09:34:15 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40788 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jU9Gh-00042K-3e for qemu-devel@nongnu.org; Thu, 30 Apr 2020 09:30:23 -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-309-ct3wnUH5Mna9H5tqC7S0Ug-1; Thu, 30 Apr 2020 09:30:20 -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 5DF14107ACCA; Thu, 30 Apr 2020 13:30:19 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-60.ams2.redhat.com [10.36.114.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 617E16A942; Thu, 30 Apr 2020 13:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588253422; 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=KcFDP/ksCSb7a8hsuYkhAgmErquzGZ1XAxrWAYD/CyQ=; b=bQIxYmyip9XJRPd6oPAzj8C4PMAXf88nbxgTkxZpoWWO42eiUhzXiqX19e2avjIKZWmRiG fRSNyA2h/TBW2FZvRlGxP7iB92Gl7UPqzYBKzBHbRMvZkhP/MhdWolDdvmLwLqXlo24Ulm B29PKUhSL2IVQ59EjkgoMQ0kVeKoqhU= X-MC-Unique: ct3wnUH5Mna9H5tqC7S0Ug-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 2/6] vmdk: Fix zero cluster allocation Date: Thu, 30 Apr 2020 15:30:03 +0200 Message-Id: <20200430133007.170335-3-kwolf@redhat.com> In-Reply-To: <20200430133007.170335-1-kwolf@redhat.com> References: <20200430133007.170335-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 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=207.211.31.81; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 01:31:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" m_data must be contain valid data even for zero clusters when no cluster was allocated in the image file. Without this, zero writes segfault with images that have zeroed_grain=3Don. For zero writes, we don't want to allocate a cluster in the image file even in compressed files. Fixes: 524089bce43fd1cd3daaca979872451efa2cf7c6 Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/vmdk.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 5b09275578..bdd7d2dcf1 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1572,6 +1572,12 @@ static int get_cluster_offset(BlockDriverState *bs, extent->l2_cache_counts[min_index] =3D 1; found: l2_index =3D ((offset >> 9) / extent->cluster_sectors) % extent->l2_si= ze; + if (m_data) { + m_data->l1_index =3D l1_index; + m_data->l2_index =3D l2_index; + m_data->l2_offset =3D l2_offset; + m_data->l2_cache_entry =3D ((uint32_t *)l2_table) + l2_index; + } =20 if (extent->sesparse) { cluster_sector =3D le64_to_cpu(((uint64_t *)l2_table)[l2_index]); @@ -1631,10 +1637,6 @@ static int get_cluster_offset(BlockDriverState *bs, } if (m_data) { m_data->new_allocation =3D true; - m_data->l1_index =3D l1_index; - m_data->l2_index =3D l2_index; - m_data->l2_offset =3D l2_offset; - m_data->l2_cache_entry =3D ((uint32_t *)l2_table) + l2_index; } } *cluster_offset =3D cluster_sector << BDRV_SECTOR_BITS; @@ -1990,7 +1992,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_= t offset, error_report("Could not write to allocated cluster" " for streamOptimized"); return -EIO; - } else { + } else if (!zeroed) { /* allocate */ ret =3D get_cluster_offset(bs, extent, &m_data, offset, true, &cluster_offset, 0, 0); --=20 2.25.3