From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty7-0005aA-OU for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKty6-0003VB-Px for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty6-0003Ur-I0 for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:02 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19JQ2Pw014766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 14:26:02 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 14:25:47 -0500 Message-Id: <1423509950-7468-10-git-send-email-mreitz@redhat.com> In-Reply-To: <1423509950-7468-1-git-send-email-mreitz@redhat.com> References: <1423509950-7468-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/12] qcow2/overlaps: Protect snapshot table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , 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 d83a939..c32d889 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -262,8 +262,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 8225ca2..1e9b29a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -799,6 +799,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) { -- 2.1.0