From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJng1-0002Oa-SZ for qemu-devel@nongnu.org; Mon, 27 Jul 2015 15:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJng0-0002CE-UE for qemu-devel@nongnu.org; Mon, 27 Jul 2015 15:03:05 -0400 From: Max Reitz Date: Mon, 27 Jul 2015 21:02:18 +0200 Message-Id: <1438023746-10132-10-git-send-email-mreitz@redhat.com> In-Reply-To: <1438023746-10132-1-git-send-email-mreitz@redhat.com> References: <1438023746-10132-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 09/17] qcow2/overlaps: Protect snapshot 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 snapshot table in the metadata list to protect it against accidental modifications. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2-snapshot.c | 10 ++++++++++ block/qcow2.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 7add805f..6d1ae00 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -263,8 +263,18 @@ static int qcow2_write_snapshots(BlockDriverState *bs) /* free the old snapshot table */ qcow2_free_clusters(bs, s->snapshots_offset, s->snapshots_size, QCOW2_DISCARD_SNAPSHOT); + + qcow2_metadata_list_remove(bs, s->snapshots_offset, + size_to_clusters(s, s->snapshots_size), + QCOW2_OL_SNAPSHOT_TABLE); + s->snapshots_offset = snapshots_offset; s->snapshots_size = snapshots_size; + + qcow2_metadata_list_enter(bs, s->snapshots_offset, + size_to_clusters(s, s->snapshots_size), + QCOW2_OL_SNAPSHOT_TABLE); + return 0; fail: diff --git a/block/qcow2.c b/block/qcow2.c index b7d0f33..0e7b646 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -811,6 +811,12 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, error_setg(errp, "Invalid snapshot table offset"); goto fail; } + if (header.nb_snapshots) { + qcow2_metadata_list_enter(bs, header.snapshots_offset, + size_to_clusters(s, header.nb_snapshots * + sizeof(QCowSnapshotHeader)), + QCOW2_OL_SNAPSHOT_TABLE); + } /* read the level 1 table */ if (header.l1_size > QCOW_MAX_L1_SIZE / sizeof(uint64_t)) { -- 2.4.6