chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: let manager_free() handle NULLs
[elogind.git]
/
src
/
core
/
kmod-setup.c
diff --git
a/src/core/kmod-setup.c
b/src/core/kmod-setup.c
index bc3460a698b3e73b41c1ae0e5722933339d7d302..fd0a0e06adcdff080d7af7512a216ebb25e4bca8 100644
(file)
--- a/
src/core/kmod-setup.c
+++ b/
src/core/kmod-setup.c
@@
-23,16
+23,17
@@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
+
+#ifdef HAVE_KMOD
#include <libkmod.h>
#include <libkmod.h>
+#endif
#include "macro.h"
#include "execute.h"
#include "macro.h"
#include "execute.h"
-
+#include "capability.h"
#include "kmod-setup.h"
#include "kmod-setup.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
+#ifdef HAVE_KMOD
static void systemd_kmod_log(
void *data,
int priority,
static void systemd_kmod_log(
void *data,
int priority,
@@
-42,21
+43,37
@@
static void systemd_kmod_log(
va_list args) {
/* library logging is enabled at debug only */
va_list args) {
/* library logging is enabled at debug only */
+ DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(LOG_DEBUG, file, line, fn, format, args);
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;
_cleanup_free_ char *line = NULL;
+ const char *p;
+ int r;
- if (proc_cmdline(&line) < 0)
+ r = proc_cmdline(&line);
+ if (r < 0)
return false;
return false;
- return strstr(line, "kdbus") == 0;
+ p = line;
+ for (;;) {
+ _cleanup_free_ char *word = NULL;
+
+ r = unquote_first_word(&p, &word, true);
+ if (r <= 0)
+ return false;
+
+ if (streq(word, "kdbus"))
+ return true;
+ }
}
}
+#endif
int kmod_setup(void) {
int kmod_setup(void) {
+#ifdef HAVE_KMOD
+
static const struct {
const char *module;
const char *path;
static const struct {
const char *module;
const char *path;
@@
-73,19
+90,22
@@
int kmod_setup(void) {
{ "unix", "/proc/net/unix", true, NULL },
/* IPC is needed before we bring up any other services */
{ "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/
fs/kdbus", false, cmdline_check_kdbus
},
};
struct kmod_ctx *ctx = NULL;
unsigned int i;
int r;
};
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;
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;
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)
continue;
if (kmod_table[i].warn)
@@
-113,7
+133,7
@@
int kmod_setup(void) {
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));
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);
log_error("Failed to insert module '%s'", kmod_module_get_name(mod));
kmod_module_unref(mod);
@@
-122,5
+142,6
@@
int kmod_setup(void) {
if (ctx)
kmod_unref(ctx);
if (ctx)
kmod_unref(ctx);
+#endif
return 0;
}
return 0;
}