[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 09/17] qcow2/overlaps: Protect snapshot table
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 09/17] qcow2/overlaps: Protect snapshot table |
Date: |
Mon, 27 Jul 2015 21:02:18 +0200 |
Keep track of the snapshot table in the metadata list to protect it
against accidental modifications.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PATCH v5 00/17] qcow2: Add new overlap check functions, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 01/17] qcow2: Add new overlap check functions, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 03/17] qcow2: Create metadata list, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 02/17] qcow2: Pull up overlap check option evaluation, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 04/17] qcow2/overlaps: Protect image header, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 05/17] qcow2/overlaps: Protect refcount table, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 06/17] qcow2/overlaps: Protect refcount blocks, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 07/17] qcow2/overlaps: Protect active L1 table, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 09/17] qcow2/overlaps: Protect snapshot table,
Max Reitz <=
- [Qemu-devel] [PATCH v5 08/17] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 10/17] qcow2/overlaps: Protect inactive L1 tables, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 11/17] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 12/17] qcow2: Use new metadata overlap check function, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 13/17] qcow2/overlaps: Add "memory limit reached" event, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 14/17] qcow2/overlaps: Add memory usage limit, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 15/17] qcow2: Add overlap structure memory size options, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 16/17] qapi: Expose new qcow2 overlap check options, Max Reitz, 2015/07/27
- [Qemu-devel] [PATCH v5 17/17] iotests: Test qcow2's overlap check memory limit, Max Reitz, 2015/07/27