From: Eric Blake <eblake@redhat.com>
Date: Thu, 2 Jun 2011 23:52:16 +0000 (-0600)
Subject: storage: avoid mishandling backing store > 2GB
X-Git-Tag: v0.9.3-rc1~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54456cc0fd3590ae9d1d4a74161eb9aa76d66710;p=thirdparty%2Flibvirt.git

storage: avoid mishandling backing store > 2GB

Detected by Coverity.  The code was doing math on shifted unsigned
char (which promotes to int), then promoting that to unsigned long
during assignment to size.  On 64-bit platforms, this risks sign
extending values of size > 2GiB.  Bug present since commit
489fd3 (v0.6.0).

I'm not sure if a specially-crafted bogus qcow2 image could
exploit this, although it's probably not possible, since we
were already checking for the computed results being within
range of our fixed-size buffer.

* src/util/storage_file.c (qcowXGetBackingStore): Avoid sign
extension.
---

diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 6b3b756362..06cabc8b5a 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -274,7 +274,7 @@ qcowXGetBackingStore(char **res,
                      bool isQCow2)
 {
     unsigned long long offset;
-    unsigned long size;
+    unsigned int size;
 
     *res = NULL;
     if (format)