External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Need to properly read the crypt offset value

Browse Source 
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.
This commit is contained in:
John Ferlan 2016-09-06 17:00:30 -04:00
parent b68487c917
commit 2f6b750eca
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/virstoragefile.c
View File

@ -888,7 +888,7 @@ virStorageFileHasEncryptionFormat(const struct FileEncryptionInfo *info,
size_t len) size_t len)
{ {
if (!info->magic && info->modeOffset == -1) 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 (info->magic) {
if (!virStorageFileMatchesMagic(info->magicOffset, if (!virStorageFileMatchesMagic(info->magicOffset,
@ -906,10 +906,13 @@ virStorageFileHasEncryptionFormat(const struct FileEncryptionInfo *info,
return true; return true;
} else if (info->modeOffset != -1) { } else if (info->modeOffset != -1) {
int crypt_format;
if (info->modeOffset >= len) if (info->modeOffset >= len)
return false; return false;
if (buf[info->modeOffset] != info->modeValue) crypt_format = virReadBufInt32BE(buf + info->modeOffset);
if (crypt_format != info->modeValue)
return false; return false;
return true; return true;