X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fkmod-setup.c;h=efbdf31688cd56d8dd52abdcd899c39b4eb898e4;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hp=cc2a2d94b2f8a027e0d3dc1d6f2fd98a63462cdc;hpb=e62abb626806140a4cd9abc928d23c661a7b9a33;p=elogind.git

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index cc2a2d94b..efbdf3168 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,72 +19,101 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/wait.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
+
+#ifdef HAVE_KMOD
 #include <libkmod.h>
+#endif
 
 #include "macro.h"
-#include "execute.h"
-
+#include "capability.h"
 #include "kmod-setup.h"
 
-static const char * const kmod_table[] = {
-        "autofs4", "/sys/class/misc/autofs",
-        "ipv6",    "/sys/module/ipv6",
-        "unix",    "/proc/net/unix"
-};
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-static void systemd_kmod_log(void *data, int priority, const char *file, int line,
-                             const char *fn, const char *format, va_list args)
-{
-        log_metav(priority, file, line, fn, format, args);
+#ifdef HAVE_KMOD
+static void systemd_kmod_log(
+                void *data,
+                int priority,
+                const char *file, int line,
+                const char *fn,
+                const char *format,
+                va_list args) {
+
+        /* library logging is enabled at debug only */
+        DISABLE_WARNING_FORMAT_NONLITERAL;
+        log_internalv(LOG_DEBUG, 0, file, line, fn, format, args);
+        REENABLE_WARNING;
+}
+
+static bool cmdline_check_kdbus(void) {
+        return get_proc_cmdline_key("kdbus", NULL) > 0;
 }
-#pragma GCC diagnostic pop
+#endif
 
 int kmod_setup(void) {
-        unsigned i;
+#ifdef HAVE_KMOD
+
+        static const struct {
+                const char *module;
+                const char *path;
+                bool warn;
+                bool (*condition_fn)(void);
+        } kmod_table[] = {
+                /* auto-loading on use doesn't work before udev is up */
+                { "autofs4", "/sys/class/misc/autofs", true, NULL                 },
+
+                /* early configure of ::1 on the loopback device */
+                { "ipv6",    "/sys/module/ipv6",       true, NULL                 },
+
+                /* this should never be a module */
+                { "unix",    "/proc/net/unix",         true, NULL                 },
+
+                /* IPC is needed before we bring up any other services */
+                { "kdbus",   "/sys/fs/kdbus",          false, cmdline_check_kdbus },
+        };
         struct kmod_ctx *ctx = NULL;
-        struct kmod_module *mod;
-        int err;
+        unsigned int i;
+        int r;
 
-        for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
+        if (have_effective_cap(CAP_SYS_MODULE) == 0)
+                return 0;
 
-                if (access(kmod_table[i+1], F_OK) >= 0)
+        for (i = 0; i < ELEMENTSOF(kmod_table); i++) {
+                struct kmod_module *mod;
+
+                if (kmod_table[i].path && access(kmod_table[i].path, F_OK) >= 0)
+                        continue;
+
+                if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn())
                         continue;
 
-                log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. "
-                          "We'll now try to work around this by loading the module...",
-                          kmod_table[i]);
+                if (kmod_table[i].warn)
+                        log_debug("Your kernel apparently lacks built-in %s support. Might be "
+                                  "a good idea to compile it in. We'll now try to work around "
+                                  "this by loading the module...", kmod_table[i].module);
 
                 if (!ctx) {
                         ctx = kmod_new(NULL, NULL);
-                        if (!ctx) {
-                                log_error("Failed to allocate memory for kmod");
-                                return -ENOMEM;
-                        }
+                        if (!ctx)
+                                return log_oom();
 
                         kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
-
                         kmod_load_resources(ctx);
                 }
 
-                err = kmod_module_new_from_name(ctx, kmod_table[i], &mod);
-                if (err < 0) {
-                        log_error("Failed to load module '%s'", kmod_table[i]);
+                r = kmod_module_new_from_name(ctx, kmod_table[i].module, &mod);
+                if (r < 0) {
+                        log_error("Failed to lookup module '%s'", kmod_table[i].module);
                         continue;
                 }
 
-                err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
-                if (err == 0)
+                r = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
+                if (r == 0)
                         log_info("Inserted module '%s'", kmod_module_get_name(mod));
-                else if (err == KMOD_PROBE_APPLY_BLACKLIST)
+                else if (r == KMOD_PROBE_APPLY_BLACKLIST)
                         log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
-                else
-                        log_error("Failed to insert '%s'", kmod_module_get_name(mod));
+                else if (kmod_table[i].warn)
+                        log_error("Failed to insert module '%s'", kmod_module_get_name(mod));
 
                 kmod_module_unref(mod);
         }
@@ -92,5 +121,6 @@ int kmod_setup(void) {
         if (ctx)
                 kmod_unref(ctx);
 
+#endif
         return 0;
 }