From 35d1d771dd41c1063281567862f1b2dbcc99f039 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 2 Mar 2012 15:44:03 +0100 Subject: [PATCH 08/12] qcow2: Fix bdrv_write_compressed error handling RH-Author: Kevin Wolf Message-id: <1330703043-5996-1-git-send-email-kwolf@redhat.com> Patchwork-id: 37888 O-Subject: [RHEL-6.3 qemu-kvm PATCH] qcow2: Fix bdrv_write_compressed error handling Bugzilla: 790350 RH-Acked-by: Laszlo Ersek RH-Acked-by: Markus Armbruster RH-Acked-by: Luiz Capitulino Bugzilla: 790350 If during allocation of compressed clusters the cluster was already allocated uncompressed, fail and properly release the l2_table (the latter avoids a failed assertion). While at it, make it return some real error numbers instead of -1. Signed-off-by: Kevin Wolf Reviewed-by: Dong Xu Wang (cherry picked from commit 8f1efd00c4b2aa2b75fd20b5ee592ed47d33d5a7) --- block/qcow2-cluster.c | 6 ++++-- block/qcow2.c | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) Signed-off-by: Michal Novotny --- block/qcow2-cluster.c | 6 ++++-- block/qcow2.c | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 0d3ac58..acf7977 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -561,8 +561,10 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, } cluster_offset = be64_to_cpu(l2_table[l2_index]); - if (cluster_offset & QCOW_OFLAG_COPIED) - return cluster_offset & ~QCOW_OFLAG_COPIED; + if (cluster_offset & QCOW_OFLAG_COPIED) { + qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table); + return 0; + } if (cluster_offset) qcow2_free_any_clusters(bs, cluster_offset, 1); diff --git a/block/qcow2.c b/block/qcow2.c index 1bc9e94..24a4080 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1187,8 +1187,8 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, Z_DEFLATED, -12, 9, Z_DEFAULT_STRATEGY); if (ret != 0) { - g_free(out_buf); - return -1; + ret = -EINVAL; + goto fail; } strm.avail_in = s->cluster_size; @@ -1198,9 +1198,9 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, ret = deflate(&strm, Z_FINISH); if (ret != Z_STREAM_END && ret != Z_OK) { - g_free(out_buf); deflateEnd(&strm); - return -1; + ret = -EINVAL; + goto fail; } out_len = strm.next_out - out_buf; @@ -1208,22 +1208,29 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, if (ret != Z_STREAM_END || out_len >= s->cluster_size) { /* could not compress: write normal cluster */ - bdrv_write(bs, sector_num, buf, s->cluster_sectors); + ret = bdrv_write(bs, sector_num, buf, s->cluster_sectors); + if (ret < 0) { + goto fail; + } } else { cluster_offset = qcow2_alloc_compressed_cluster_offset(bs, sector_num << 9, out_len); - if (!cluster_offset) - return -1; + if (!cluster_offset) { + ret = -EIO; + goto fail; + } cluster_offset &= s->cluster_offset_mask; BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED); - if (bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len) != out_len) { - g_free(out_buf); - return -1; + ret = bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len); + if (ret < 0) { + goto fail; } } + ret = 0; +fail: g_free(out_buf); - return 0; + return ret; } static int qcow2_co_flush(BlockDriverState *bs) -- 1.7.7.6