[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 10/17] qcow2/overlaps: Protect inactive L1 tables
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 10/17] qcow2/overlaps: Protect inactive L1 tables |
Date: |
Mon, 27 Jul 2015 21:02:19 +0200 |
Keep track of the inactive L1 tables in the metadata list to protect
them against accidental modifications.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/qcow2-snapshot.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 6d1ae00..95afd87 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -122,6 +122,21 @@ int qcow2_read_snapshots(BlockDriverState *bs)
ret = -EFBIG;
goto fail;
}
+
+ if (!(s->overlap_check & QCOW2_OL_INACTIVE_L1)) {
+ continue;
+ }
+
+ if (sn->l1_size > INT_MAX / sizeof(uint64_t)) {
+ /* Do not fail opening the image because a snapshot is broken which
+ * might not be used anyway */
+ continue;
+ }
+
+ qcow2_metadata_list_enter(bs, sn->l1_table_offset,
+ size_to_clusters(s, sn->l1_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_INACTIVE_L1);
}
assert(offset - s->snapshots_offset <= INT_MAX);
@@ -415,6 +430,11 @@ int qcow2_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
g_free(l1_table);
l1_table = NULL;
+ qcow2_metadata_list_enter(bs, sn->l1_table_offset,
+ size_to_clusters(s, sn->l1_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_INACTIVE_L1);
+
/*
* Increase the refcounts of all clusters and make sure everything is
* stable on disk before updating the snapshot table to contain a pointer
@@ -635,6 +655,11 @@ int qcow2_snapshot_delete(BlockDriverState *bs,
g_free(sn.id_str);
g_free(sn.name);
+ qcow2_metadata_list_remove(bs, sn.l1_table_offset,
+ size_to_clusters(s, sn.l1_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_INACTIVE_L1);
+
/*
* Now decrease the refcounts of clusters referenced by the snapshot and
* free the L1 table.
--
2.4.6
- [Qemu-block] [PATCH v5 00/17] qcow2: Add new overlap check functions, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 01/17] qcow2: Add new overlap check functions, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 02/17] qcow2: Pull up overlap check option evaluation, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 03/17] qcow2: Create metadata list, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 04/17] qcow2/overlaps: Protect image header, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 05/17] qcow2/overlaps: Protect refcount table, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 07/17] qcow2/overlaps: Protect active L1 table, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 06/17] qcow2/overlaps: Protect refcount blocks, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 09/17] qcow2/overlaps: Protect snapshot table, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 08/17] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 10/17] qcow2/overlaps: Protect inactive L1 tables,
Max Reitz <=
- [Qemu-block] [PATCH v5 11/17] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 12/17] qcow2: Use new metadata overlap check function, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 13/17] qcow2/overlaps: Add "memory limit reached" event, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 15/17] qcow2: Add overlap structure memory size options, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 14/17] qcow2/overlaps: Add memory usage limit, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 16/17] qapi: Expose new qcow2 overlap check options, Max Reitz, 2015/07/27
- [Qemu-block] [PATCH v5 17/17] iotests: Test qcow2's overlap check memory limit, Max Reitz, 2015/07/27