From 2c6fc46d987911e310d30621cd6fc195af102fee Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 20 Jan 2015 17:01:01 +0100 Subject: [PATCH] CVE-2015-0236: qemu: Check ACLs when dumping security info from snapshots 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. (cherry picked from commit b347c0c2a321ec5c20aae214927949832a288c5a) --- 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 069e8c6a6c..0716d88f97 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13166,7 +13166,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, if (!(vm = qemuDomObjFromSnapshot(snapshot))) goto cleanup; - 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 f4ed1e5b80..8c77c05ba9 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -4175,6 +4175,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,