From: John Ferlan <jferlan@redhat.com>
Date: Tue, 6 Dec 2016 23:37:46 +0000 (-0500)
Subject: storage: Allow probe of volume capacity for BLOCK type
X-Git-Tag: CVE-2017-2635~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9508682ba090014f0fdf9399ca256b2fa5a606ec;p=thirdparty%2Flibvirt.git

storage: Allow probe of volume capacity for BLOCK type

If the voldef type is VIR_STORAGE_VOL_BLOCK, then as long as the
format is known, let's allow the probe to happen - gets a truer value
and the same probe/update would be allowed for the same volume defined
in a domain.
---

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 742dc07db6..20c2b85115 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -1900,7 +1900,7 @@ virStorageBackendUpdateVolTargetInfo(virStorageVolType voltype,
     if ((ret = virStorageBackendUpdateVolTargetInfoFD(target, fd, &sb)) < 0)
         goto cleanup;
 
-    if (voltype == VIR_STORAGE_VOL_FILE &&
+    if ((voltype == VIR_STORAGE_VOL_FILE || voltype == VIR_STORAGE_VOL_BLOCK) &&
         target->format != VIR_STORAGE_FILE_NONE) {
         if (S_ISDIR(sb.st_mode)) {
             if (virStorageBackendIsPloopDir(target->path)) {