From: Katerina Koukiou <kkoukiou@redhat.com>
Date: Wed, 6 Jun 2018 14:15:19 +0000 (+0200)
Subject: storage: fix crash in luks encrypted volume creation
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fab2e49d;p=libvirt.git

storage: fix crash in luks encrypted volume creation

Fix the case when creating a luks encrypted volume
via an xml file without 'secret' element.
libvirtd was receiving SIGSEGV, now proper error is reported for
the missing element.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1468422

Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
---

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 554fc757ed..87f2115869 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -1277,6 +1277,13 @@ storageBackendCreateQemuImgSecretPath(virStoragePoolObjPtr pool,
         return NULL;
     }
 
+    if (enc->nsecrets != 1) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("A single <secret type='passphrase'...> "
+                         "element is expected in encryption description"));
+        return NULL;
+    }
+
     conn = virGetConnectSecret();
     if (!conn)
         return NULL;