qcow2: Correct snapshots size for overlap check
PATCH 1/1 qcow2: Correct snapshots size for overlap check
Using s->snapshots_size instead of snapshots_size for the metadata overlap check in qcow2_write_snapshots leads to the detection of an overlap with the main qcow2 image header when deleting the last snapshot, since s->snapshots_size has not yet been updated and is therefore non-zero. However, the offset returned by qcow2_alloc_clusters will be zero since snapshots_size is zero. Therefore, an overlap is detected albeit no such will occur.
This patch fixes this by replacing s->snapshots_size by snapshots_size when calling qcow2_pre_write_overlap_check.
--- block/qcow2-snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/qcow2-snapshot.c +1 -1
@@ -192,7 +192,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs)/* The snapshot list position has not yet been updated, so these clusters * must indeed be completely free */ ret =qcow2_pre_write_overlap_check (bs,QCOW2_OL_DEFAULT , offset, - s->snapshots_size); + snapshots_size);if (ret <0 ) {return ret; }
Signature · 1 line
1.8.3.1
Stefan Hajnoczi
AppliedQuoted 8 lines · Max Reitz
Using
s->snapshots_sizeinstead ofsnapshots_sizefor the metadata overlap check inqcow2_write_snapshotsleads to the detection of an overlap with the main qcow2 image header when deleting the last snapshot, sinces->snapshots_sizehas not yet been updated and is therefore non-zero. However, the offset returned byqcow2_alloc_clusterswill be zero sincesnapshots_sizeis zero. Therefore, an overlap is detected albeit no such will occur.
Quoted 7 lines
This patch fixes this by replacing
s->snapshots_sizebysnapshots_sizewhen callingqcow2_pre_write_overlap_check.Signed-off-by Max Reitz <[email protected]>--- block/qcow2-snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan