[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 06/17] qcow2/overlaps: Protect refcount blocks
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v6 06/17] qcow2/overlaps: Protect refcount blocks |
Date: |
Wed, 5 Aug 2015 19:32:54 +0200 |
Keep track of the refcount blocks 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-refcount.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 8e302bd..13799c8 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -106,8 +106,16 @@ int qcow2_refcount_init(BlockDriverState *bs)
if (ret < 0) {
goto fail;
}
- for(i = 0; i < s->refcount_table_size; i++)
+ for (i = 0; i < s->refcount_table_size; i++) {
+ uint64_t refblock_offset;
+
be64_to_cpus(&s->refcount_table[i]);
+ refblock_offset = s->refcount_table[i] & REFT_OFFSET_MASK;
+ if (refblock_offset) {
+ qcow2_metadata_list_enter(bs, refblock_offset, 1,
+ QCOW2_OL_REFCOUNT_BLOCK);
+ }
+ }
}
return 0;
fail:
@@ -439,6 +447,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
}
s->refcount_table[refcount_table_index] = new_block;
+ qcow2_metadata_list_enter(bs, new_block, 1, QCOW2_OL_REFCOUNT_BLOCK);
/* The new refcount block may be where the caller intended to put its
* data, so let it restart the search. */
@@ -509,6 +518,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
uint64_t table_offset = meta_offset + blocks_clusters * s->cluster_size;
uint64_t *new_table = g_try_new0(uint64_t, table_size);
void *new_blocks = g_try_malloc0(blocks_clusters * s->cluster_size);
+ uint64_t block_index;
assert(table_size > 0 && blocks_clusters > 0);
if (new_table == NULL || new_blocks == NULL) {
@@ -587,6 +597,12 @@ static int alloc_refcount_block(BlockDriverState *bs,
qcow2_metadata_list_enter(bs, table_offset, table_clusters,
QCOW2_OL_REFCOUNT_TABLE);
+ for (block_index = 0; block_index < blocks_clusters; block_index++) {
+ qcow2_metadata_list_enter(bs, meta_offset +
+ (block_index << s->cluster_bits), 1,
+ QCOW2_OL_REFCOUNT_BLOCK);
+ }
+
/* Free old table. */
qcow2_free_clusters(bs, old_table_offset, old_table_size *
sizeof(uint64_t),
QCOW2_DISCARD_OTHER);
@@ -2164,14 +2180,34 @@ write_refblocks:
* sizeof(uint64_t)),
QCOW2_OL_REFCOUNT_TABLE);
+ for (refblock_index = 0; refblock_index < s->refcount_table_size;
+ refblock_index++)
+ {
+ uint64_t refblock_offset = s->refcount_table[refblock_index] &
+ REFT_OFFSET_MASK;
+ if (refblock_offset) {
+ qcow2_metadata_list_remove(bs, refblock_offset, 1,
+ QCOW2_OL_REFCOUNT_BLOCK);
+ }
+ }
+
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++)
{
+ uint64_t refblock_offset;
+
be64_to_cpus(&on_disk_reftable[refblock_index]);
+
+ refblock_offset = on_disk_reftable[refblock_index] & REFT_OFFSET_MASK;
+ if (refblock_offset) {
+ qcow2_metadata_list_enter(bs, refblock_offset, 1,
+ QCOW2_OL_REFCOUNT_BLOCK);
+ }
}
+
s->refcount_table = on_disk_reftable;
s->refcount_table_offset = reftable_offset;
s->refcount_table_size = reftable_size;
--
2.4.6
- [Qemu-block] [PATCH v6 00/17] qcow2: Add new overlap check functions, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 01/17] qcow2: Add new overlap check functions, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 02/17] qcow2: Pull up overlap check option evaluation, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 03/17] qcow2: Create metadata list, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 04/17] qcow2/overlaps: Protect image header, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 05/17] qcow2/overlaps: Protect refcount table, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 06/17] qcow2/overlaps: Protect refcount blocks,
Max Reitz <=
- [Qemu-block] [PATCH v6 07/17] qcow2/overlaps: Protect active L1 table, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 08/17] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 09/17] qcow2/overlaps: Protect snapshot table, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 10/17] qcow2/overlaps: Protect inactive L1 tables, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 12/17] qcow2: Use new metadata overlap check function, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 13/17] qcow2/overlaps: Add "memory limit reached" event, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 11/17] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 14/17] qcow2/overlaps: Add memory usage limit, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 17/17] iotests: Test qcow2's overlap check memory limit, Max Reitz, 2015/08/05
- [Qemu-block] [PATCH v6 16/17] qapi: Expose new qcow2 overlap check options, Max Reitz, 2015/08/05