From fd48a871a9dcdb8b8b1eb39612e5df870a7e2c3c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>

Date: Tue, 30 Apr 2019 17:26:13 +0100

Subject: [PATCH 1/3] admin: reject clients unless their UID matches the

 current UID

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

The admin protocol RPC messages are only intended for use by the user

running the daemon. As such they should not be allowed for any client

UID that does not match the server UID.

Fixes CVE-2019-10132

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

(cherry picked from commit 96f41cd765c9e525fe28ee5abbfbf4a79b3720c7)

---

 src/admin/admin_server_dispatch.c | 22 ++++++++++++++++++++++

 1 file changed, 22 insertions(+)

diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c

index 85e693d76c..6e3b99f97d 100644

--- a/src/admin/admin_server_dispatch.c

+++ b/src/admin/admin_server_dispatch.c

@@ -64,6 +64,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,

                    void *opaque)

 {

     struct daemonAdmClientPrivate *priv;

+    uid_t clientuid;

+    gid_t clientgid;

+    pid_t clientpid;

+    unsigned long long timestamp;

+

+    if (virNetServerClientGetUNIXIdentity(client,

+                                          &clientuid,

+                                          &clientgid,

+                                          &clientpid,

+                                          &timestamp) < 0)

+        return NULL;

+

+    VIR_DEBUG("New client pid %lld uid %lld",

+              (long long)clientpid,

+              (long long)clientuid);

+

+    if (geteuid() != clientuid) {

+        virReportRestrictedError(_("Disallowing client %lld with uid %lld"),

+                                 (long long)clientpid,

+                                 (long long)clientuid);

+        return NULL;

+    }

     if (VIR_ALLOC(priv) < 0)

         return NULL;

-- 

2.21.0