qcow2: Fix corruption after error in update_refcount
authorKevin Wolf <kwolf@redhat.com>
Fri, 28 May 2010 10:21:27 +0000 (12:21 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 28 May 2010 11:29:16 +0000 (13:29 +0200)
After it is done with updating refcounts in the cache, update_refcount writes
all changed entries to disk. If a refcount block allocation fails, however,
there was no change yet and therefore first_index = last_index = -1. Don't
treat -1 as a normal sector index (resulting in a 512 byte write!) but return
without updating anything in this case.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/qcow2-refcount.c

index 5b7cda4..22b0b45 100644 (file)
@@ -417,6 +417,10 @@ static int write_refcount_block_entries(BlockDriverState *bs,
         return 0;
     }
 
+    if (first_index < 0) {
+        return 0;
+    }
+
     first_index &= ~(REFCOUNTS_PER_SECTOR - 1);
     last_index = (last_index + REFCOUNTS_PER_SECTOR)
         & ~(REFCOUNTS_PER_SECTOR - 1);