From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlL3t-0001il-2f for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:05:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlL3m-00020G-SZ for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:05:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlL3m-0001zy-MG for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:04:54 -0500 From: Max Reitz Date: Mon, 3 Nov 2014 18:04:26 +0100 Message-Id: <1415034271-8774-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1415034271-8774-1-git-send-email-mreitz@redhat.com> References: <1415034271-8774-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 07/12] qcow2/overlaps: Protect active L1 table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Peter Lieven , Max Reitz , Stefan Hajnoczi Keep track of the active L1 table in the metadata list to protect it against accidental modifications. Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 11 +++++++++++ block/qcow2-snapshot.c | 10 ++++++++++ block/qcow2.c | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index df0b2c9..131e5b2 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -125,6 +125,17 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, s->l1_table = new_l1_table; old_l1_size = s->l1_size; s->l1_size = new_l1_size; + + qcow2_metadata_list_remove(bs, old_l1_table_offset, + size_to_clusters(s, old_l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + qcow2_free_clusters(bs, old_l1_table_offset, old_l1_size * sizeof(uint64_t), QCOW2_DISCARD_OTHER); return 0; diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 5b3903c..41ea053 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -720,6 +720,11 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, return ret; } + qcow2_metadata_list_remove(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + /* Switch the L1 table */ qemu_vfree(s->l1_table); @@ -731,5 +736,10 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, be64_to_cpus(&s->l1_table[i]); } + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); + return 0; } diff --git a/block/qcow2.c b/block/qcow2.c index 1644421..775cb39 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -831,6 +831,10 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, } s->l1_table_offset = header.l1_table_offset; + qcow2_metadata_list_enter(bs, s->l1_table_offset, + size_to_clusters(s, s->l1_size * + sizeof(uint64_t)), + QCOW2_OL_ACTIVE_L1); if (s->l1_size > 0) { s->l1_table = qemu_try_blockalign(bs->file, -- 1.9.3