yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
9ae3a8
From 981daae137fd383944e72dbea8f147499eb9add4 Mon Sep 17 00:00:00 2001
9ae3a8
From: Max Reitz <mreitz@redhat.com>
9ae3a8
Date: Sat, 13 Jun 2015 16:21:56 +0200
9ae3a8
Subject: [PATCH 02/42] qcow2: Catch bdrv_getlength() error
9ae3a8
9ae3a8
Message-id: <1434212556-3927-3-git-send-email-mreitz@redhat.com>
9ae3a8
Patchwork-id: 66021
9ae3a8
O-Subject: [RHEL-7.2 qemu-kvm PATCH 02/42] qcow2: Catch bdrv_getlength() error
9ae3a8
Bugzilla: 1129893
9ae3a8
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
9ae3a8
RH-Acked-by: Fam Zheng <famz@redhat.com>
9ae3a8
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
9ae3a8
9ae3a8
BZ: 1129893
9ae3a8
9ae3a8
The call to bdrv_getlength() from qcow2_check_refcounts() may result in
9ae3a8
an error. Check this and abort if necessary.
9ae3a8
9ae3a8
Signed-off-by: Max Reitz <mreitz@redhat.com>
9ae3a8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9ae3a8
(cherry picked from commit a49139af77850d64d74f9ffe43cabe7aa4f19de0)
9ae3a8
9ae3a8
Signed-off-by: Max Reitz <mreitz@redhat.com>
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 block/qcow2-refcount.c | 5 +++++
9ae3a8
 1 file changed, 5 insertions(+)
9ae3a8
9ae3a8
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
9ae3a8
index 429b01c..4f86923 100644
9ae3a8
--- a/block/qcow2-refcount.c
9ae3a8
+++ b/block/qcow2-refcount.c
9ae3a8
@@ -1478,6 +1478,11 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
9ae3a8
     int ret;
9ae3a8
 
9ae3a8
     size = bdrv_getlength(bs->file);
9ae3a8
+    if (size < 0) {
9ae3a8
+        res->check_errors++;
9ae3a8
+        return size;
9ae3a8
+    }
9ae3a8
+
9ae3a8
     nb_clusters = size_to_clusters(s, size);
9ae3a8
     if (nb_clusters > INT_MAX) {
9ae3a8
         res->check_errors++;
9ae3a8
-- 
9ae3a8
1.8.3.1
9ae3a8