From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZN2ZB-0007FX-Sw for qemu-devel@nongnu.org; Wed, 05 Aug 2015 13:33:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZN2ZA-00012G-S4 for qemu-devel@nongnu.org; Wed, 05 Aug 2015 13:33:25 -0400 From: Max Reitz Date: Wed, 5 Aug 2015 19:32:53 +0200 Message-Id: <1438795985-21903-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1438795985-21903-1-git-send-email-mreitz@redhat.com> References: <1438795985-21903-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 05/17] qcow2/overlaps: Protect refcount table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Keep track of the refcount table in the metadata list to protect it against accidental modifications. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2-refcount.c | 18 ++++++++++++++++++ block/qcow2.c | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index b0ee42d..8e302bd 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -579,6 +579,14 @@ static int alloc_refcount_block(BlockDriverState *bs, s->refcount_table_size = table_size; s->refcount_table_offset = table_offset; + qcow2_metadata_list_remove(bs, old_table_offset, + size_to_clusters(s, old_table_size * + sizeof(uint64_t)), + QCOW2_OL_REFCOUNT_TABLE); + + qcow2_metadata_list_enter(bs, table_offset, table_clusters, + QCOW2_OL_REFCOUNT_TABLE); + /* Free old table. */ qcow2_free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t), QCOW2_DISCARD_OTHER); @@ -2151,6 +2159,16 @@ write_refblocks: goto fail; } + qcow2_metadata_list_remove(bs, s->refcount_table_offset, + size_to_clusters(s, s->refcount_table_size + * sizeof(uint64_t)), + QCOW2_OL_REFCOUNT_TABLE); + + qcow2_metadata_list_enter(bs, reftable_offset, + size_to_clusters(s, reftable_size * + sizeof(uint64_t)), + QCOW2_OL_REFCOUNT_TABLE); + for (refblock_index = 0; refblock_index < reftable_size; refblock_index++) { be64_to_cpus(&on_disk_reftable[refblock_index]); } diff --git a/block/qcow2.c b/block/qcow2.c index 9815325..e34cd7c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -792,6 +792,10 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, error_setg(errp, "Invalid reference count table offset"); goto fail; } + qcow2_metadata_list_enter(bs, s->refcount_table_offset, + size_to_clusters(s, s->refcount_table_size * + sizeof(uint64_t)), + QCOW2_OL_REFCOUNT_TABLE); /* Snapshot table offset/length */ if (header.nb_snapshots > QCOW_MAX_SNAPSHOTS) { -- 2.4.6