qcow2: Switch L1 table in a single sequence
PATCH 1/1 qcow2: Switch L1 table in a single sequence
Switching the L1 table in memory should be an atomic operation, as far as possible. Calling qcow2_free_clusters on the old L1 table on disk is not a good idea when the old L1 table is no longer valid and the address to the new one hasn't yet been written into the corresponding BDRVQcowState field. To be more specific, this can lead to segfaults due to qcow2_check_metadata_overlap trying to access the L1 table during the free operation.
--- block/qcow2-cluster.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
block/qcow2-cluster.c +5 -2
@@ -35,6 +35,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,BDRVQcowState *s = bs->opaque;int new_l1_size2, ret, i;uint64_t *new_l1_table; +int64_t old_l1_table_offset, old_l1_size;int64_t new_l1_table_offset, new_l1_size;uint8_t data[12 ];
@@ -106,11 +107,13 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, goto fail; }g_free (s->l1_table); -qcow2_free_clusters (bs, s->l1_table_offset, s->l1_size *sizeof (uint64_t ), -QCOW2_DISCARD_OTHER ); + old_l1_table_offset = s->l1_table_offset; s->l1_table_offset = new_l1_table_offset; s->l1_table = new_l1_table; + old_l1_size = s->l1_size; s->l1_size = new_l1_size; +qcow2_free_clusters (bs, old_l1_table_offset, old_l1_size *sizeof (uint64_t ), +QCOW2_DISCARD_OTHER );return 0 ; fail:g_free (new_l1_table);
Signature · 1 line
1.8.3.1
Quoted 8 lines · Max Reitz
Switching the L1 table in memory should be an atomic operation, as far as possible. Calling
qcow2_free_clusterson the old L1 table on disk is not a good idea when the old L1 table is no longer valid and the address to the new one hasn't yet been written into the corresponding BDRVQcowState field. To be more specific, this can lead to segfaults due toqcow2_check_metadata_overlaptrying to access the L1 table during the free operation.
Quoted 4 lines
Signed-off-by Max Reitz <[email protected]>--- block/qcow2-cluster.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Am 30.09.2013 um 17:57 hat Max Reitz geschrieben:
Quoted 9 lines
Switching the L1 table in memory should be an atomic operation, as far as possible. Calling
qcow2_free_clusterson the old L1 table on disk is not a good idea when the old L1 table is no longer valid and the address to the new one hasn't yet been written into the corresponding BDRVQcowState field. To be more specific, this can lead to segfaults due toqcow2_check_metadata_overlaptrying to access the L1 table during the free operation.Signed-off-by Max Reitz <[email protected]>
Stefan Hajnoczi
AppliedQuoted 8 lines · Max Reitz
Switching the L1 table in memory should be an atomic operation, as far as possible. Calling
qcow2_free_clusterson the old L1 table on disk is not a good idea when the old L1 table is no longer valid and the address to the new one hasn't yet been written into the corresponding BDRVQcowState field. To be more specific, this can lead to segfaults due toqcow2_check_metadata_overlaptrying to access the L1 table during the free operation.
Quoted 4 lines
Signed-off-by Max Reitz <[email protected]>--- block/qcow2-cluster.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan