[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/17] qcow2/overlaps: Protect active L1 table
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 07/17] qcow2/overlaps: Protect active L1 table |
Date: |
Wed, 5 Aug 2015 19:32:55 +0200 |
Keep track of the active L1 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-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 b43f186..b95f6fe 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 b6f58c1..05e814d 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -719,6 +719,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);
@@ -730,5 +735,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 e34cd7c..c186452 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -844,6 +844,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,
--
2.4.6
- [Qemu-devel] [PATCH v6 00/17] qcow2: Add new overlap check functions, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 02/17] qcow2: Pull up overlap check option evaluation, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 01/17] qcow2: Add new overlap check functions, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 04/17] qcow2/overlaps: Protect image header, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 03/17] qcow2: Create metadata list, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 05/17] qcow2/overlaps: Protect refcount table, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 06/17] qcow2/overlaps: Protect refcount blocks, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 07/17] qcow2/overlaps: Protect active L1 table,
Max Reitz <=
- [Qemu-devel] [PATCH v6 09/17] qcow2/overlaps: Protect snapshot table, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 08/17] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 11/17] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 10/17] qcow2/overlaps: Protect inactive L1 tables, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 13/17] qcow2/overlaps: Add "memory limit reached" event, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 12/17] qcow2: Use new metadata overlap check function, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 17/17] iotests: Test qcow2's overlap check memory limit, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 16/17] qapi: Expose new qcow2 overlap check options, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 15/17] qcow2: Add overlap structure memory size options, Max Reitz, 2015/08/05
- [Qemu-devel] [PATCH v6 14/17] qcow2/overlaps: Add memory usage limit, Max Reitz, 2015/08/05