From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 29 Apr 2010 12:47:48 +0000 (+0200)
Subject: qemu-img rebase: Fix output image corruption
X-Git-Tag: v0.13.0-rc0~639^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc60e327c0988a5e5288cf7bb78cd9848db800ab;p=thirdparty%2Fqemu.git

qemu-img rebase: Fix output image corruption

qemu-img rebase must always give clusters in the COW file priority over those
in the backing file. As it failed to use number of non-allocated clusters but
assumed the maximum, it was possible that allocated clusters were taken from
the backing file instead, leading to a corrupted output image.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/qemu-img.c b/qemu-img.c
index c21d9990e05..d3c30a74f37 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1136,7 +1136,7 @@ static int img_rebase(int argc, char **argv)
     if (!unsafe) {
         uint64_t num_sectors;
         uint64_t sector;
-        int n, n1;
+        int n;
         uint8_t * buf_old;
         uint8_t * buf_new;
 
@@ -1155,8 +1155,8 @@ static int img_rebase(int argc, char **argv)
             }
 
             /* If the cluster is allocated, we don't need to take action */
-            if (bdrv_is_allocated(bs, sector, n, &n1)) {
-                n = n1;
+            ret = bdrv_is_allocated(bs, sector, n, &n);
+            if (ret) {
                 continue;
             }