forked from rpms/libvirt
73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
|
From 48f74599ffc86aa632ee39aff1aa8459880ec283 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <48f74599ffc86aa632ee39aff1aa8459880ec283@dist-git>
|
||
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||
|
|
Date: Tue, 29 Sep 2020 14:43:05 +0200
|
||
|
|
Subject: [PATCH] rpc: require write acl for guest agent in
|
||
|
|
virDomainInterfaceAddresses
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2020-25637
|
||
|
|
|
||
|
|
Add a requirement for domain:write if source is set to
|
||
|
|
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT.
|
||
|
|
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
||
|
|
(cherry picked from commit e4116eaa44cb366b59f7fe98f4b88d04c04970ad)
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
|
||
|
|
Conflicts: src/lxc/lxc_driver.c
|
||
|
|
The LXC implementation of the API was introduced
|
||
|
|
in libvirt 6.1.0, so it's not present downstream.
|
||
|
|
Message-Id: <5fdc2ebf7621698c8136b354922c687fc09286de.1601383236.git.jtomko@redhat.com>
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/libxl/libxl_driver.c | 2 +-
|
||
|
|
src/qemu/qemu_driver.c | 2 +-
|
||
|
|
src/remote/remote_protocol.x | 1 +
|
||
|
|
3 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
|
||
|
|
index f021ec9c5d..1449795494 100644
|
||
|
|
--- a/src/libxl/libxl_driver.c
|
||
|
|
+++ b/src/libxl/libxl_driver.c
|
||
|
|
@@ -6318,7 +6318,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/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||
|
|
index f8a259e020..0f06974a1b 100644
|
||
|
|
--- a/src/qemu/qemu_driver.c
|
||
|
|
+++ b/src/qemu/qemu_driver.c
|
||
|
|
@@ -22240,7 +22240,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 2527a78142..fbd30085b2 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.28.0
|
||
|
|
|