From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 25 Oct 2021 14:30:41 +0000 (+0200)
Subject: storage_file: Compute QCOW2 cluster size as ULL
X-Git-Tag: v7.9.0-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5198c2542a6041f03e5ba345223435a0de15dc04;p=thirdparty%2Flibvirt.git

storage_file: Compute QCOW2 cluster size as ULL

While the QCOW2 cluster size is represented in only 4 bits in the QCOW2
header and thus 1 << cluster_size cannot overflow int,
qcow2GetClusterSize is supposed to return unsigned long long so we can
just compute the result as ULL rather than computing it as int and
promoting to unsigned long long.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c
index f5bb8b7dbb..dc438a5e5d 100644
--- a/src/storage_file/storage_file_probe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -487,7 +487,7 @@ qcow2GetClusterSize(const char *buf,
     clusterBits = virReadBufInt32BE(buf + QCOWX_HDR_CLUSTER_BITS_OFFSET);
 
     if (clusterBits > 0)
-        return 1 << clusterBits;
+        return 1ULL << clusterBits;
 
     return 0;
 }