From 759a9d3b849035bbb02bd516f7adee988bb9191a Mon Sep 17 00:00:00 2001 From: Kevin Wolf <kwolf@redhat.com> Date: Thu, 21 Jan 2010 14:02:59 -0200 Subject: [PATCH 01/10] qcow2: Fix error handling in qcow2_grow_l1_table RH-Author: Kevin Wolf <kwolf@redhat.com> Message-id: <1264082588-10273-2-git-send-email-kwolf@redhat.com> Patchwork-id: 6510 O-Subject: [RHEL-5.5 KVM PATCH 01/10] qcow2: Fix error handling in qcow2_grow_l1_table Bugzilla: 537077 RH-Acked-by: Christoph Hellwig <chellwig@redhat.com> RH-Acked-by: Juan Quintela <quintela@redhat.com> RH-Acked-by: Gleb Natapov <gleb@redhat.com> RH-Acked-by: Markus Armbruster <armbru@redhat.com> Bugzilla: 537077 Upstream status: Submitted Return the appropriate error value instead of always using EIO. Don't free the L1 table on errors, we still need it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- qemu/block-qcow2.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- qemu/block-qcow2.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qemu/block-qcow2.c b/qemu/block-qcow2.c index ddc2e49..4ed2ff2 100644 --- a/qemu/block-qcow2.c +++ b/qemu/block-qcow2.c @@ -572,9 +572,10 @@ static int grow_l1_table(BlockDriverState *bs, int min_size) /* set new table */ cpu_to_be32w((uint32_t*)data, new_l1_size); cpu_to_be64w((uint64_t*)(data + 4), new_l1_table_offset); - if (bdrv_pwrite(s->hd, offsetof(QCowHeader, l1_size), data, - sizeof(data)) != sizeof(data)) + ret = bdrv_pwrite(s->hd, offsetof(QCowHeader, l1_size), data,sizeof(data)); + if (ret != sizeof(data)) { goto fail; + } qemu_free(s->l1_table); free_clusters(bs, s->l1_table_offset, s->l1_size * sizeof(uint64_t)); s->l1_table_offset = new_l1_table_offset; @@ -582,8 +583,9 @@ static int grow_l1_table(BlockDriverState *bs, int min_size) s->l1_size = new_l1_size; return 0; fail: - qemu_free(s->l1_table); - return -EIO; + qemu_free(new_l1_table); + free_clusters(bs, new_l1_table_offset, new_l1_size2); + return ret < 0 ? ret : -EIO; } /* -- 1.6.3.rc4.29.g8146