From: John Ferlan <jferlan@redhat.com>
Date: Tue, 6 Sep 2016 21:00:30 +0000 (-0400)
Subject: storage: Need to properly read the crypt offset value
X-Git-Tag: v2.3.0-rc1~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f6b750ecaff0e1d87e17d3a7c5a01218a527220;p=thirdparty%2Flibvirt.git

storage: Need to properly read the crypt offset value

Commit id 'a48c7141' altered how to determine if a volume was encrypted
by adding a peek at an offset into the file at a specific buffer location.
Unfortunately, all that was compared was the first "char" of the buffer
against the expect "int" value.

Restore the virReadBufInt32BE to get the complete field in order to
compare against the expected value from the qcow2EncryptionInfo or
qcow1EncryptionInfo "modeValue" field.

This restores the capability to create a volume with encryption, then
refresh the pool, and still find the encryption for the volume.
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 41827f0c9b..272db672db 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -888,7 +888,7 @@ virStorageFileHasEncryptionFormat(const struct FileEncryptionInfo *info,
                                   size_t len)
 {
     if (!info->magic && info->modeOffset == -1)
-        return 0; /* Shouldn't happen - expect at least one */
+        return false; /* Shouldn't happen - expect at least one */
 
     if (info->magic) {
         if (!virStorageFileMatchesMagic(info->magicOffset,
@@ -906,10 +906,13 @@ virStorageFileHasEncryptionFormat(const struct FileEncryptionInfo *info,
 
         return true;
     } else if (info->modeOffset != -1) {
+        int crypt_format;
+
         if (info->modeOffset >= len)
             return false;
 
-        if (buf[info->modeOffset] != info->modeValue)
+        crypt_format = virReadBufInt32BE(buf + info->modeOffset);
+        if (crypt_format != info->modeValue)
             return false;
 
         return true;