9b85a9
From 9062f89d17d1ab5d6c5c3efae8c6056149ef0a28 Mon Sep 17 00:00:00 2001
9b85a9
Message-Id: <9062f89d17d1ab5d6c5c3efae8c6056149ef0a28@dist-git>
9b85a9
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
9b85a9
Date: Wed, 15 May 2019 21:40:57 +0100
9b85a9
Subject: [PATCH] locking: restrict sockets to mode 0600
9b85a9
MIME-Version: 1.0
9b85a9
Content-Type: text/plain; charset=UTF-8
9b85a9
Content-Transfer-Encoding: 8bit
9b85a9
9b85a9
The virtlockd daemon's only intended client is the libvirtd daemon. As
9b85a9
such it should never allow clients from other user accounts to connect.
9b85a9
The code already enforces this and drops clients from other UIDs, but
9b85a9
we can get earlier (and thus stronger) protection against DoS by setting
9b85a9
the socket permissions to 0600
9b85a9
9b85a9
Fixes CVE-2019-10132
9b85a9
9b85a9
Reviewed-by: Ján Tomko <jtomko@redhat.com>
9b85a9
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
9b85a9
(cherry picked from a private commit)
9b85a9
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
9b85a9
Message-Id: <20190515204058.28077-3-berrange@redhat.com>
9b85a9
---
9b85a9
 src/locking/virtlockd-admin.socket.in | 1 +
9b85a9
 src/locking/virtlockd.socket.in       | 1 +
9b85a9
 2 files changed, 2 insertions(+)
9b85a9
9b85a9
diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
9b85a9
index 2a7500f3d0..f674c492f7 100644
9b85a9
--- a/src/locking/virtlockd-admin.socket.in
9b85a9
+++ b/src/locking/virtlockd-admin.socket.in
9b85a9
@@ -5,6 +5,7 @@ Before=libvirtd.service
9b85a9
 [Socket]
9b85a9
 ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
9b85a9
 Service=virtlockd.service
9b85a9
+SocketMode=0600
9b85a9
 
9b85a9
 [Install]
9b85a9
 WantedBy=sockets.target
9b85a9
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
9b85a9
index 45e0f20235..d701b27516 100644
9b85a9
--- a/src/locking/virtlockd.socket.in
9b85a9
+++ b/src/locking/virtlockd.socket.in
9b85a9
@@ -4,6 +4,7 @@ Before=libvirtd.service
9b85a9
 
9b85a9
 [Socket]
9b85a9
 ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
9b85a9
+SocketMode=0600
9b85a9
 
9b85a9
 [Install]
9b85a9
 WantedBy=sockets.target
9b85a9
-- 
9b85a9
2.21.0
9b85a9