Blame SOURCES/kvm-vmdk-Fix-next_cluster_sector-for-compressed-write.patch

34b321
From 47886bf3b19f06d0a5255d9656d1c02800baddd0 Mon Sep 17 00:00:00 2001
34b321
From: Fam Zheng <famz@redhat.com>
34b321
Date: Mon, 15 Feb 2016 09:28:25 +0100
34b321
Subject: [PATCH 12/18] vmdk: Fix next_cluster_sector for compressed write
34b321
34b321
RH-Author: Fam Zheng <famz@redhat.com>
34b321
Message-id: <1455528511-9357-13-git-send-email-famz@redhat.com>
34b321
Patchwork-id: 69178
34b321
O-Subject: [RHEL-7.3 qemu-kvm PATCH 12/18] vmdk: Fix next_cluster_sector for compressed write
34b321
Bugzilla: 1299250
34b321
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
34b321
RH-Acked-by: Max Reitz <mreitz@redhat.com>
34b321
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
34b321
34b321
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1299250
34b321
34b321
This fixes the bug introduced by commit c6ac36e (vmdk: Optimize cluster
34b321
allocation).
34b321
34b321
Sometimes, write_len could be larger than cluster size, because it
34b321
contains both data and marker.  We must advance next_cluster_sector in
34b321
this case, otherwise the image gets corrupted.
34b321
34b321
Cc: qemu-stable@nongnu.org
34b321
Reported-by: Antoni Villalonga <qemu-list@friki.cat>
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Reviewed-by: Max Reitz <mreitz@redhat.com>
34b321
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
34b321
(cherry picked from commit 5e82a31eb967db135fc4e688b134fb0972d62de3)
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
34b321
---
34b321
 block/vmdk.c | 14 ++++++++++----
34b321
 1 file changed, 10 insertions(+), 4 deletions(-)
34b321
34b321
diff --git a/block/vmdk.c b/block/vmdk.c
34b321
index 3810d75..dd8b638 100644
34b321
--- a/block/vmdk.c
34b321
+++ b/block/vmdk.c
34b321
@@ -1297,6 +1297,8 @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,
34b321
     uLongf buf_len;
34b321
     const uint8_t *write_buf = buf;
34b321
     int write_len = nb_sectors * 512;
34b321
+    int64_t write_offset;
34b321
+    int64_t write_end_sector;
34b321
 
34b321
     if (extent->compressed) {
34b321
         if (!extent->has_marker) {
34b321
@@ -1315,10 +1317,14 @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,
34b321
         write_buf = (uint8_t *)data;
34b321
         write_len = buf_len + sizeof(VmdkGrainMarker);
34b321
     }
34b321
-    ret = bdrv_pwrite(extent->file,
34b321
-                        cluster_offset + offset_in_cluster,
34b321
-                        write_buf,
34b321
-                        write_len);
34b321
+    write_offset = cluster_offset + offset_in_cluster,
34b321
+    ret = bdrv_pwrite(extent->file, write_offset, write_buf, write_len);
34b321
+
34b321
+    write_end_sector = DIV_ROUND_UP(write_offset + write_len, BDRV_SECTOR_SIZE);
34b321
+
34b321
+    extent->next_cluster_sector = MAX(extent->next_cluster_sector,
34b321
+                                      write_end_sector);
34b321
+
34b321
     if (ret != write_len) {
34b321
         ret = ret < 0 ? ret : -EIO;
34b321
         goto out;
34b321
-- 
34b321
1.8.3.1
34b321