[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] qcow2/overlaps: Protect refcount table
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 05/12] qcow2/overlaps: Protect refcount table |
Date: |
Mon, 3 Nov 2014 18:04:24 +0100 |
Keep track of the refcount table in the metadata list to protect it
against accidental modifications.
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2-refcount.c | 18 ++++++++++++++++++
block/qcow2.c | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 9afdb40..97c28da 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -433,6 +433,14 @@ static int alloc_refcount_block(BlockDriverState *bs,
s->refcount_table_size = table_size;
s->refcount_table_offset = table_offset;
+ qcow2_metadata_list_remove(bs, old_table_offset,
+ size_to_clusters(s, old_table_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_REFCOUNT_TABLE);
+
+ qcow2_metadata_list_enter(bs, table_offset, table_clusters,
+ QCOW2_OL_REFCOUNT_TABLE);
+
/* Free old table. */
qcow2_free_clusters(bs, old_table_offset, old_table_size *
sizeof(uint64_t),
QCOW2_DISCARD_OTHER);
@@ -1948,6 +1956,16 @@ write_refblocks:
goto fail;
}
+ qcow2_metadata_list_remove(bs, s->refcount_table_offset,
+ size_to_clusters(s, s->refcount_table_size
+ * sizeof(uint64_t)),
+ QCOW2_OL_REFCOUNT_TABLE);
+
+ qcow2_metadata_list_enter(bs, reftable_offset,
+ size_to_clusters(s, reftable_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_REFCOUNT_TABLE);
+
for (refblock_index = 0; refblock_index < reftable_size; refblock_index++)
{
be64_to_cpus(&on_disk_reftable[refblock_index]);
}
diff --git a/block/qcow2.c b/block/qcow2.c
index 19ac2df..1644421 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -779,6 +779,10 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
error_setg(errp, "Invalid reference count table offset");
goto fail;
}
+ qcow2_metadata_list_enter(bs, s->refcount_table_offset,
+ size_to_clusters(s, s->refcount_table_size *
+ sizeof(uint64_t)),
+ QCOW2_OL_REFCOUNT_TABLE);
/* Snapshot table offset/length */
if (header.nb_snapshots > QCOW_MAX_SNAPSHOTS) {
--
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 <=
- [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, 2014/11/03
- [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