summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Krempa <pkrempa@redhat.com>2015-01-20 17:01:01 +0100
committerPeter Krempa <pkrempa@redhat.com>2015-01-22 14:32:54 +0100
commitb347c0c2a321ec5c20aae214927949832a288c5a (patch)
tree31430db6c19174b41af83a1c0aa012f7c0f9394b
parent03c3c0c874c84dfa51ef17556062b095c6e1c0a3 (diff)
downloadlibvirt-b347c0c2a321ec5c20aae214927949832a288c5a.tar.gz
CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshotsCVE-2015-0236-2
The ACL check didn't check the VIR_DOMAIN_XML_SECURE flag and the appropriate permission for it. Found via code inspection while fixing permissions for save images.
-rw-r--r--src/qemu/qemu_driver.c2
-rw-r--r--src/remote/remote_protocol.x1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c9110f0360..bc6aae40e5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14406,7 +14406,7 @@ qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
if (!(vm = qemuDomObjFromSnapshot(snapshot)))
return NULL;
- if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def) < 0)
+ if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def, flags) < 0)
goto cleanup;
if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot)))
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 15694fa158..c8162a5041 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -4489,6 +4489,7 @@ enum remote_procedure {
* @generate: both
* @priority: high
* @acl: domain:read
+ * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE
*/
REMOTE_PROC_DOMAIN_SNAPSHOT_GET_XML_DESC = 186,