From patchwork Wed Feb 9 09:30:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 82440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 400A3B70EA for ; Wed, 9 Feb 2011 20:29:44 +1100 (EST) Received: from localhost ([127.0.0.1]:46452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pn6Mm-0002IV-W6 for incoming@patchwork.ozlabs.org; Wed, 09 Feb 2011 04:29:41 -0500 Received: from [140.186.70.92] (port=60808 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pn6Lr-0002Ht-Mv for qemu-devel@nongnu.org; Wed, 09 Feb 2011 04:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pn6Ln-0001MQ-J7 for qemu-devel@nongnu.org; Wed, 09 Feb 2011 04:28:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pn6Ln-0001MG-AM for qemu-devel@nongnu.org; Wed, 09 Feb 2011 04:28:39 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p199SbPb015627 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Feb 2011 04:28:38 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p199SaL4011605; Wed, 9 Feb 2011 04:28:37 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 9 Feb 2011 10:30:20 +0100 Message-Id: <1297243820-7914-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH] qcow2: Fix error handling for reading compressed clusters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When reading a compressed cluster failed, qcow2 falsely returned success. Signed-off-by: Kevin Wolf Reviewed-by: Markus Armbruster --- block/qcow2-cluster.c | 4 ++-- block/qcow2.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 5fb8c66..437aaa8 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -878,11 +878,11 @@ int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset) BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED); ret = bdrv_read(bs->file, coffset >> 9, s->cluster_data, nb_csectors); if (ret < 0) { - return -1; + return ret; } if (decompress_buffer(s->cluster_cache, s->cluster_size, s->cluster_data + sector_offset, csize) < 0) { - return -1; + return -EIO; } s->cluster_cache_offset = coffset; } diff --git a/block/qcow2.c b/block/qcow2.c index 647c2a4..551b3c2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -497,8 +497,10 @@ static void qcow2_aio_read_cb(void *opaque, int ret) } } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) { /* add AIO support for compressed blocks ? */ - if (qcow2_decompress_cluster(bs, acb->cluster_offset) < 0) + ret = qcow2_decompress_cluster(bs, acb->cluster_offset); + if (ret < 0) { goto done; + } qemu_iovec_from_buffer(&acb->hd_qiov, s->cluster_cache + index_in_cluster * 512,