Received: from eggs.gnu.org ([2001:4830:134:3::10]:54819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgDPX-0005zU-MN for qemu-devel@nongnu.org; Tue, 12 Nov 2013 07:49:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgDPQ-0003by-EL for qemu-devel@nongnu.org; Tue, 12 Nov 2013 07:49:39 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:48712 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgDPQ-0003bp-3P for qemu-devel@nongnu.org; Tue, 12 Nov 2013 07:49:32 -0500 From: Peter Lieven Date: Tue, 12 Nov 2013 13:48:07 +0100 Message-Id: <1384260487-5032-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 1.7] qcow2: fix possible corruption when reading multiple clusters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, Peter Lieven , qemu-stable@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com if multiple sectors spanning multiple clusters are read the function count_contiguous_clusters should ensure that the cluster type should not change between the clusters. Especially the for-loop should break when we have one or more normal clusters followed by a compressed cluster. Unfortunately the wrong macro was used in the mask to compare the flags. This was discovered while debugging a data corruption issue when converting a compressed qcow2 image to raw. qemu-img reads 2MB chunks which span multiple clusters. CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven --- block/qcow2-cluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 6d7d1ac..11f9c50 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -290,7 +290,7 @@ static int count_contiguous_clusters(uint64_t nb_clusters, int cluster_size, uint64_t *l2_table, uint64_t stop_flags) { int i; - uint64_t mask = stop_flags | L2E_OFFSET_MASK | QCOW2_CLUSTER_COMPRESSED; + uint64_t mask = stop_flags | L2E_OFFSET_MASK | QCOW_OFLAG_COMPRESSED; uint64_t first_entry = be64_to_cpu(l2_table[0]); uint64_t offset = first_entry & mask; -- 1.7.9.5