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)
This commit is contained in:
Peter Krempa 2015-01-20 17:01:01 +01:00 committed by Eric Blake
parent 9a2728e1b2
commit 2c6fc46d98
2 changed files with 2 additions and 1 deletions

View File

@ -13166,7 +13166,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
if (!(vm = qemuDomObjFromSnapshot(snapshot))) if (!(vm = qemuDomObjFromSnapshot(snapshot)))
goto cleanup; goto cleanup;
if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def) < 0) if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def, flags) < 0)
goto cleanup; goto cleanup;
if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot)))

View File

@ -4175,6 +4175,7 @@ enum remote_procedure {
* @generate: both * @generate: both
* @priority: high * @priority: high
* @acl: domain:read * @acl: domain:read
* @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE
*/ */
REMOTE_PROC_DOMAIN_SNAPSHOT_GET_XML_DESC = 186, REMOTE_PROC_DOMAIN_SNAPSHOT_GET_XML_DESC = 186,