From nobody Tue Feb 10 05:17:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528856678427791.5594530074069; Tue, 12 Jun 2018 19:24:38 -0700 (PDT) Received: from localhost ([::1]:59437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSvSd-0006Zr-N4 for importer@patchew.org; Tue, 12 Jun 2018 22:24:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSvAy-0001NG-Hh for qemu-devel@nongnu.org; Tue, 12 Jun 2018 22:06:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSvAx-0001e6-CO for qemu-devel@nongnu.org; Tue, 12 Jun 2018 22:06:20 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53562 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSvAu-0001bC-PP; Tue, 12 Jun 2018 22:06:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 651668886E; Wed, 13 Jun 2018 02:06:16 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-177.bos.redhat.com [10.18.17.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 239FE20284E6; Wed, 13 Jun 2018 02:06:16 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 12 Jun 2018 22:06:11 -0400 Message-Id: <20180613020613.1343-9-jsnow@redhat.com> In-Reply-To: <20180613020613.1343-1-jsnow@redhat.com> References: <20180613020613.1343-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 13 Jun 2018 02:06:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 13 Jun 2018 02:06:16 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 08/10] qcow2/bitmap: track extra_data_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Similarly to the last patch, track the extra_data_size field that we read. We do reject anything other than zero, but if this restriction is lifted in the future, we'll need to update the _info field, so loosen this now. Signed-off-by: John Snow --- block/qcow2-bitmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 36573f7b52..3c2e974458 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -86,6 +86,7 @@ typedef struct Qcow2Bitmap { uint8_t type; uint8_t granularity_bits; char *name; + uint32_t extra_data_size; =20 BdrvDirtyBitmap *dirty_bitmap; =20 @@ -609,6 +610,7 @@ static Qcow2BitmapList *bitmap_list_load(BlockDriverSta= te *bs, Error **errp) bm->table.size =3D e->bitmap_table_size; bm->flags =3D e->flags; bm->type =3D e->type; + bm->extra_data_size =3D e->extra_data_size; bm->granularity_bits =3D e->granularity_bits; bm->name =3D dir_entry_copy_name(e); QSIMPLEQ_INSERT_TAIL(bm_list, bm, entry); @@ -782,7 +784,7 @@ static int bitmap_list_store(BlockDriverState *bs, Qcow= 2BitmapList *bm_list, e->type =3D bm->type; e->granularity_bits =3D bm->granularity_bits; e->name_size =3D strlen(bm->name); - e->extra_data_size =3D 0; + e->extra_data_size =3D bm->extra_data_size; memcpy(e + 1, bm->name, e->name_size); =20 if (check_dir_entry(bs, e) < 0) { --=20 2.14.3