From afb96301f37d50a5734e7f9678f67dafe5c19a58 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 7 Feb 2012 19:54:59 +0100
Subject: [PATCH] security: Driver 'none' cannot create confined guests

In case the caller specifies that confined guests are required but the
security driver turns out to be 'none', we should return an error since
this driver clearly cannot meet that requirement.  As a result of this
error, libvirtd fails to start when the host admin explicitly sets
confined guests are required but there is no security driver available.

Since security driver 'none' cannot create confined guests, we override
default confined setting so that hypervisor drivers do not thing they
should create confined guests.
---
 src/security/security_manager.c | 20 ++++++++++++++++++++
 tests/seclabeltest.c            |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index d0bafae062..0a43458d78 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -115,6 +115,26 @@ virSecurityManagerPtr virSecurityManagerNew(const char *name,
     if (!drv)
         return NULL;
 
+    /* driver "none" needs some special handling of *Confined bools */
+    if (STREQ(drv->name, "none")) {
+        if (requireConfined) {
+            virSecurityReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                    _("Security driver \"none\" cannot create confined guests"));
+            return NULL;
+        }
+
+        if (defaultConfined) {
+            if (name != NULL) {
+                VIR_WARN("Configured security driver \"none\" disables default"
+                         " policy to create confined guests");
+            } else {
+                VIR_DEBUG("Auto-probed security driver is \"none\";"
+                          " confined guests will not be created");
+            }
+            defaultConfined = false;
+        }
+    }
+
     return virSecurityManagerNewDriver(drv,
                                        allowDiskFormatProbing,
                                        defaultConfined,
diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index 1898c3e91d..fca76b9851 100644
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -13,7 +13,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
     virSecurityManagerPtr mgr;
     const char *doi, *model;
 
-    mgr = virSecurityManagerNew(NULL, false, true, true);
+    mgr = virSecurityManagerNew(NULL, false, true, false);
     if (mgr == NULL) {
         fprintf (stderr, "Failed to start security driver");
         exit (-1);
-- 
GitLab