From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jan 2015 16:01:01 +0000 (+0100)
Subject: CVE-2015-0236: qemu: Check ACLs when dumping security info from save image
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e99c25ca63c695a63b4c9b91ee956be4fb660772;p=thirdparty%2Flibvirt.git

CVE-2015-0236: qemu: Check ACLs when dumping security info from save image

The ACL check didn't check the VIR_DOMAIN_XML_SECURE flag and the
appropriate permission for it.

(cherry picked from commit 03c3c0c874c84dfa51ef17556062b095c6e1c0a3)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9afec732ce..1a42cbe542 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5552,7 +5552,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path,
     if (fd < 0)
         goto cleanup;
 
-    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def) < 0)
+    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def, flags) < 0)
         goto cleanup;
 
     ret = qemuDomainDefFormatXML(driver, def, flags);
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index fef559b077..3837ed35bd 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -4621,6 +4621,7 @@ enum remote_procedure {
      * @generate: both
      * @priority: high
      * @acl: domain:read
+     * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE
      */
     REMOTE_PROC_DOMAIN_SAVE_IMAGE_GET_XML_DESC = 235,