[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] qcow2/overlaps: Protect active L1 table
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 07/12] qcow2/overlaps: Protect active L1 table |
Date: |
Mon, 3 Nov 2014 18:04:26 +0100 |
Keep track of the active L1 table in the metadata list to protect it
against accidental modifications.
Signed-off-by: Max Reitz <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 df0b2c9..131e5b2 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 5b3903c..41ea053 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -720,6 +720,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);
@@ -731,5 +736,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 1644421..775cb39 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -831,6 +831,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,
--
1.9.3
- [Qemu-devel] [PATCH 00/12] qcow2: Add new overlap check functions, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 03/12] qcow2: Create metadata list, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 01/12] qcow2: Add new overlap check functions, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 04/12] qcow2/overlaps: Protect image header, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 05/12] qcow2/overlaps: Protect refcount table, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 08/12] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 07/12] qcow2/overlaps: Protect active L1 table,
Max Reitz <=
- [Qemu-devel] [PATCH 06/12] qcow2/overlaps: Protect refcount blocks, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 09/12] qcow2/overlaps: Protect snapshot table, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 10/12] qcow2/overlaps: Protect inactive L1 tables, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 12/12] qcow2: Use new metadata overlap check function, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 11/12] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2014/11/03
- Re: [Qemu-devel] [PATCH 00/12] qcow2: Add new overlap check functions, Max Reitz, 2014/11/03
- [Qemu-devel] [PATCH 02/12] qcow2: Pull up overlap check option evaluation, Max Reitz, 2014/11/03
- Re: [Qemu-devel] [PATCH 00/12] qcow2: Add new overlap check functions, Max Reitz, 2014/11/14