security_manager: Load lock plugin on init

Now that we know what metadata lock manager user wishes to use we
can load it when initializing security driver. This is achieved
by adding new argument to virSecurityManagerNewDriver() and
subsequently to all functions that end up calling it.

The cfg.mk change is needed in order to allow lock_manager.h
inclusion in security driver without 'syntax-check' complaining.
This is safe thing to do as locking APIs will always exist (it's
only backend implementation that changes). However, instead of
allowing the include for all other drivers (like cpu, network,
and so on) allow it only for security driver. This will still
trigger the error if including from other drivers.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

cfg.mk

@@ -787,8 +787,10 @@ sc_prohibit_cross_inclusion:
 	  case $$dir in \
 	    util/) safe="util";; \
 	    access/ | conf/) safe="($$dir|conf|util)";; \
-	    cpu/| network/| node_device/| rpc/| security/| storage/) \
+	    cpu/| network/| node_device/| rpc/| storage/) \
 	      safe="($$dir|util|conf|storage)";; \
+	    security/) \
+	      safe="($$dir|util|conf|storage|locking)";; \
 	    xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen|cpu)";; \
 	    *) safe="($$dir|$(mid_dirs)|util)";; \
 	  esac; \

src/lxc/lxc_controller.c

@@ -2625,7 +2625,8 @@ int main(int argc, char *argv[])
     ctrl->handshakeFd = handshakeFd;
 
     if (!(ctrl->securityManager = virSecurityManagerNew(securityDriver,
-                                                        LXC_DRIVER_NAME, 0)))
+                                                        LXC_DRIVER_NAME,
+                                                        NULL, 0)))
         goto cleanup;
 
     if (ctrl->def->seclabels) {

src/lxc/lxc_driver.c

@@ -1532,7 +1532,7 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg)
         flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED;
 
     virSecurityManagerPtr mgr = virSecurityManagerNew(cfg->securityDriverName,
-                                                      LXC_DRIVER_NAME, flags);
+                                                      LXC_DRIVER_NAME, NULL, flags);
     if (!mgr)
         goto error;
 

src/qemu/qemu_driver.c

@@ -355,6 +355,7 @@ qemuSecurityInit(virQEMUDriverPtr driver)
         while (names && *names) {
             if (!(mgr = qemuSecurityNew(*names,
                                         QEMU_DRIVER_NAME,
+                                        cfg->metadataLockManagerName,
                                         flags)))
                 goto error;
             if (!stack) {
@@ -370,6 +371,7 @@ qemuSecurityInit(virQEMUDriverPtr driver)
     } else {
         if (!(mgr = qemuSecurityNew(NULL,
                                     QEMU_DRIVER_NAME,
+                                    cfg->metadataLockManagerName,
                                     flags)))
             goto error;
         if (!(stack = qemuSecurityNewStack(mgr)))
@@ -386,6 +388,7 @@ qemuSecurityInit(virQEMUDriverPtr driver)
                                        cfg->user,
                                        cfg->group,
                                        flags,
+                                       cfg->metadataLockManagerName,
                                        qemuSecurityChownCallback)))
             goto error;
         if (!stack) {

src/security/security_manager.c

@@ -28,6 +28,7 @@
 #include "viralloc.h"
 #include "virobject.h"
 #include "virlog.h"
+#include "locking/lock_manager.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 
@@ -40,6 +41,8 @@ struct _virSecurityManager {
     unsigned int flags;
     const char *virtDriver;
     void *privateData;
+
+    virLockManagerPluginPtr lockPlugin;
 };
 
 static virClassPtr virSecurityManagerClass;
@@ -50,8 +53,12 @@ void virSecurityManagerDispose(void *obj)
 {
     virSecurityManagerPtr mgr = obj;
 
-    if (mgr->drv->close)
+    if (mgr->drv &&
+        mgr->drv->close)
         mgr->drv->close(mgr);
+
+    virObjectUnref(mgr->lockPlugin);
+
     VIR_FREE(mgr->privateData);
 }
 
@@ -71,6 +78,7 @@ VIR_ONCE_GLOBAL_INIT(virSecurityManager);
 static virSecurityManagerPtr
 virSecurityManagerNewDriver(virSecurityDriverPtr drv,
                             const char *virtDriver,
+                            const char *lockManagerPluginName,
                             unsigned int flags)
 {
     virSecurityManagerPtr mgr = NULL;
@@ -90,6 +98,14 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv,
     if (!(mgr = virObjectLockableNew(virSecurityManagerClass)))
         goto error;
 
+    if (!lockManagerPluginName)
+        lockManagerPluginName = "nop";
+
+    if (!(mgr->lockPlugin = virLockManagerPluginNew(lockManagerPluginName,
+                                                    NULL, NULL, 0))) {
+        goto error;
+    }
+
     mgr->drv = drv;
     mgr->flags = flags;
     mgr->virtDriver = virtDriver;
@@ -112,6 +128,7 @@ virSecurityManagerNewStack(virSecurityManagerPtr primary)
     virSecurityManagerPtr mgr =
         virSecurityManagerNewDriver(&virSecurityDriverStack,
                                     virSecurityManagerGetDriver(primary),
+                                    NULL,
                                     primary->flags);
 
     if (!mgr)
@@ -120,6 +137,8 @@ virSecurityManagerNewStack(virSecurityManagerPtr primary)
     if (virSecurityStackAddNested(mgr, primary) < 0)
         goto error;
 
+    mgr->lockPlugin = virObjectRef(mgr->lockPlugin);
+
     return mgr;
  error:
     virObjectUnref(mgr);
@@ -142,6 +161,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
                          uid_t user,
                          gid_t group,
                          unsigned int flags,
+                         const char *lockManagerPluginName,
                          virSecurityManagerDACChownCallback chownCallback)
 {
     virSecurityManagerPtr mgr;
@@ -152,6 +172,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
 
     mgr = virSecurityManagerNewDriver(&virSecurityDriverDAC,
                                       virtDriver,
+                                      lockManagerPluginName,
                                       flags & VIR_SECURITY_MANAGER_NEW_MASK);
 
     if (!mgr)
@@ -173,6 +194,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
 virSecurityManagerPtr
 virSecurityManagerNew(const char *name,
                       const char *virtDriver,
+                      const char *lockManagerPluginName,
                       unsigned int flags)
 {
     virSecurityDriverPtr drv = virSecurityDriverLookup(name, virtDriver);
@@ -201,6 +223,7 @@ virSecurityManagerNew(const char *name,
 
     return virSecurityManagerNewDriver(drv,
                                        virtDriver,
+                                       lockManagerPluginName,
                                        flags);
 }
 

src/security/security_manager.h

@@ -45,6 +45,7 @@ typedef enum {
 
 virSecurityManagerPtr virSecurityManagerNew(const char *name,
                                             const char *virtDriver,
+                                            const char *lockManagerPluginName,
                                             unsigned int flags);
 
 virSecurityManagerPtr virSecurityManagerNewStack(virSecurityManagerPtr primary);
@@ -70,6 +71,7 @@ virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver,
                                                uid_t user,
                                                gid_t group,
                                                unsigned int flags,
+                                               const char *lockManagerPluginName,
                                                virSecurityManagerDACChownCallback chownCallback);
 
 int virSecurityManagerPreFork(virSecurityManagerPtr mgr);

tests/seclabeltest.c

@@ -18,7 +18,7 @@ mymain(void)
     if (virThreadInitialize() < 0)
         return EXIT_FAILURE;
 
-    mgr = virSecurityManagerNew(NULL, "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED);
+    mgr = virSecurityManagerNew(NULL, "QEMU", NULL, VIR_SECURITY_MANAGER_DEFAULT_CONFINED);
     if (mgr == NULL) {
         fprintf(stderr, "Failed to start security driver");
         return EXIT_FAILURE;

tests/securityselinuxlabeltest.c

@@ -349,7 +349,7 @@ mymain(void)
     if (!rc)
         return EXIT_AM_SKIP;
 
-    if (!(mgr = virSecurityManagerNew("selinux", "QEMU",
+    if (!(mgr = virSecurityManagerNew("selinux", "QEMU", NULL,
                                       VIR_SECURITY_MANAGER_DEFAULT_CONFINED |
                                       VIR_SECURITY_MANAGER_PRIVILEGED))) {
         VIR_TEST_VERBOSE("Unable to initialize security driver: %s\n",

tests/securityselinuxtest.c

@@ -275,7 +275,7 @@ mymain(void)
     int ret = 0;
     virSecurityManagerPtr mgr;
 
-    if (!(mgr = virSecurityManagerNew("selinux", "QEMU",
+    if (!(mgr = virSecurityManagerNew("selinux", "QEMU", NULL,
                                       VIR_SECURITY_MANAGER_DEFAULT_CONFINED |
                                       VIR_SECURITY_MANAGER_PRIVILEGED))) {
         fprintf(stderr, "Unable to initialize security driver: %s\n",

tests/testutilsqemu.c

@@ -717,7 +717,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
     if (qemuTestCapsCacheInsert(driver->qemuCapsCache, NULL) < 0)
         goto error;
 
-    if (!(mgr = virSecurityManagerNew("none", "qemu",
+    if (!(mgr = virSecurityManagerNew("none", "qemu", NULL,
                                       VIR_SECURITY_MANAGER_PRIVILEGED)))
         goto error;
     if (!(driver->securityManager = virSecurityManagerNewStack(mgr)))