#include "macro.h"
#include "execute.h"
-
+#include "capability.h"
#include "kmod-setup.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
static void systemd_kmod_log(
void *data,
int priority,
va_list args) {
/* library logging is enabled at debug only */
+ DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(LOG_DEBUG, file, line, fn, format, args);
+ REENABLE_WARNING;
}
-#pragma GCC diagnostic pop
-
-static bool kmod_check_cmdline(void) {
+static bool cmdline_check_kdbus(void) {
_cleanup_free_ char *line = NULL;
- if (proc_cmdline(&line) < 0)
+ if (proc_cmdline(&line) <= 0)
return false;
- return strstr(line, "kdbus") == 0;
+ return strstr(line, "kdbus") != NULL;
}
int kmod_setup(void) {
+
static const struct {
const char *module;
const char *path;
{ "unix", "/proc/net/unix", true, NULL },
/* IPC is needed before we bring up any other services */
- { "kdbus", "/sys/bus/kdbus", false, kmod_check_cmdline },
+ { "kdbus", "/sys/bus/kdbus", false, cmdline_check_kdbus },
};
struct kmod_ctx *ctx = NULL;
unsigned int i;
int r;
+ if (have_effective_cap(CAP_SYS_MODULE) == 0)
+ return 0;
+
for (i = 0; i < ELEMENTSOF(kmod_table); i++) {
struct kmod_module *mod;
- if (kmod_table[i].condition_fn && kmod_table[i].condition_fn())
+ if (kmod_table[i].path && access(kmod_table[i].path, F_OK) >= 0)
continue;
- if (access(kmod_table[i].path, F_OK) >= 0)
+ if (kmod_table[i].condition_fn && !kmod_table[i].condition_fn())
continue;
if (kmod_table[i].warn)
log_info("Inserted module '%s'", kmod_module_get_name(mod));
else if (r == KMOD_PROBE_APPLY_BLACKLIST)
log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
- else
+ else if (kmod_table[i].warn)
log_error("Failed to insert module '%s'", kmod_module_get_name(mod));
kmod_module_unref(mod);