From 9a2728e1b28b67a682e55d8dd3c0d79e21f0ad37 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jan 2015 17:01:01 +0100
Subject: [PATCH] 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)
---
src/qemu/qemu_driver.c | 2 +-
src/remote/remote_protocol.x | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5ac4218602..069e8c6a6c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5548,7 +5548,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 db3aa8a469..f4ed1e5b80 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -4503,6 +4503,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,