From 0747f83af62231476c2af0b9b8a25ebbaeba89c0 Mon Sep 17 00:00:00 2001 From: Jan Tomko Date: Wed, 14 Oct 2020 17:18:29 +0800 Subject: [PATCH] rpc: require write acl for guest agent in virDomainInterfaceAddresses CVE-2020-25637 Add a requirement for domain:write if source is set to VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT. Signed-off-by: Jan Tomko Reported-by: Ilja Van Sprundel Reviewed-by: Jiri Denemark cherry-pick from commit e4116eaa44cb366b59f7fe98f4b88d04c04970ad Signed-off-by: Jiajie Li --- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_protocol.x | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 980984b199..f07700b71c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6381,7 +6381,7 @@ libxlDomainInterfaceAddresses(virDomainPtr dom, if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) + if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 851894c459..71c7068bbf 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1698,7 +1698,7 @@ lxcDomainInterfaceAddresses(virDomainPtr dom, if (!(vm = lxcDomObjFromDomain(dom))) goto cleanup; - if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) + if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f6df2490..5901f922bf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22058,7 +22058,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, if (!(vm = qemuDomainObjFromDomain(dom))) goto cleanup; - if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) + if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 5f3858c00c..8b05082b61 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -6211,6 +6211,7 @@ enum remote_procedure { /** * @generate: none * @acl: domain:read + * @acl: domain:write::source:VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT */ REMOTE_PROC_DOMAIN_INTERFACE_ADDRESSES = 353, -- 2.23.0