Keep track of the refcount blocks in the metadata list to protect them
against accidental modifications.
Signed-off-by: Max Reitz <mre...@redhat.com>
---
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 97c28da..1d76652 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -57,8 +57,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:
@@ -302,6 +310,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. */
@@ -363,6 +372,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);
uint16_t *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) {
@@ -441,6 +451,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);
@@ -1961,14 +1977,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;
--
1.9.3
