X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=3f7d0e547e61a774f5ff4c07d00dd2d97ac235cd;hb=9925ab0451b307b5766b12134bdc178e4c89f297;hp=6239377ece80734f1221ca17489087cbd6ec5dfd;hpb=3fd0648c60b60de9836539ee4ae2f1c00a2c3a5e;p=elogind.git
diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 6239377ec..3f7d0e547 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -17,8 +17,6 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
@@ -27,28 +25,21 @@
#include
#include
#include
-#ifdef USE_SELINUX
-#include
-#endif
#include "libudev.h"
#include "libudev-private.h"
-#include "../udev.h"
struct udev {
int refcount;
void (*log_fn)(struct udev *udev,
int priority, const char *file, int line, const char *fn,
const char *format, va_list args);
+ void *userdata;
char *sys_path;
char *dev_path;
char *rules_path;
int log_priority;
-#ifdef USE_SELINUX
- int selinux_enabled;
- security_context_t selinux_prev_scontext;
-#endif
- int run:1;
+ int run;
};
void udev_log(struct udev *udev,
@@ -73,77 +64,18 @@ static void log_stderr(struct udev *udev,
vfprintf(stderr, format, args);
}
-static void selinux_init(struct udev *udev)
+void *udev_get_userdata(struct udev *udev)
{
-#ifdef USE_SELINUX
- /*
- * record the present security context, for file-creation
- * restoration creation purposes.
- */
- udev->selinux_enabled = (is_selinux_enabled() > 0);
- info(udev, "selinux=%i\n", udev->selinux_enabled);
- if (udev->selinux_enabled) {
- matchpathcon_init_prefix(NULL, udev_get_dev_path(udev));
- if (getfscreatecon(&udev->selinux_prev_scontext) < 0) {
- err(udev, "getfscreatecon failed\n");
- udev->selinux_prev_scontext = NULL;
- }
- }
-#endif
-}
-
-static void selinux_exit(struct udev *udev)
-{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- freecon(udev->selinux_prev_scontext);
- udev->selinux_prev_scontext = NULL;
- }
-#endif
-}
-
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode)
-{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- security_context_t scontext = NULL;
-
- if (matchpathcon(file, mode, &scontext) < 0) {
- err(udev, "matchpathcon(%s) failed\n", file);
- return;
- }
- if (lsetfilecon(file, scontext) < 0)
- err(udev, "setfilecon %s failed: %s\n", file, strerror(errno));
- freecon(scontext);
- }
-#endif
-}
-
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode)
-{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- security_context_t scontext = NULL;
-
- if (matchpathcon(file, mode, &scontext) < 0) {
- err(udev, "matchpathcon(%s) failed\n", file);
- return;
- }
- if (setfscreatecon(scontext) < 0)
- err(udev, "setfscreatecon %s failed: %s\n", file, strerror(errno));
- freecon(scontext);
- }
-#endif
+ if (udev == NULL)
+ return NULL;
+ return udev->userdata;
}
-void udev_selinux_resetfscreatecon(struct udev *udev)
+void udev_set_userdata(struct udev *udev, void *userdata)
{
-#ifdef USE_SELINUX
- if (udev->selinux_enabled) {
- if (setfscreatecon(udev->selinux_prev_scontext) < 0)
- err(udev, "setfscreatecon failed: %s\n", strerror(errno));
- }
-#endif
+ if (udev == NULL)
+ return;
+ udev->userdata = userdata;
}
/**
@@ -184,24 +116,24 @@ struct udev *udev_new(void)
if (env != NULL) {
free(udev->sys_path);
udev->sys_path = strdup(env);
- remove_trailing_chars(udev->sys_path, '/');
+ util_remove_trailing_chars(udev->sys_path, '/');
}
env = getenv("UDEV_RUN");
- if (env != NULL && !string_is_true(env))
+ if (env != NULL && strcmp(env, "0") == 0)
udev->run = 0;
env = getenv("UDEV_CONFIG_FILE");
if (env != NULL) {
free(config_file);
config_file = strdup(env);
- remove_trailing_chars(config_file, '/');
+ util_remove_trailing_chars(config_file, '/');
}
if (config_file == NULL)
goto err;
f = fopen(config_file, "r");
if (f != NULL) {
- char line[LINE_SIZE];
+ char line[UTIL_LINE_SIZE];
int line_nr = 0;
while (fgets(line, sizeof(line), f)) {
@@ -263,19 +195,19 @@ struct udev *udev_new(void)
}
if (strcasecmp(key, "udev_log") == 0) {
- udev->log_priority = log_priority(val);
+ udev->log_priority = util_log_priority(val);
continue;
}
if (strcasecmp(key, "udev_root") == 0) {
free(udev->dev_path);
udev->dev_path = strdup(val);
- remove_trailing_chars(udev->dev_path, '/');
+ util_remove_trailing_chars(udev->dev_path, '/');
continue;
}
if (strcasecmp(key, "udev_rules") == 0) {
free(udev->rules_path);
udev->rules_path = strdup(val);
- remove_trailing_chars(udev->rules_path, '/');
+ util_remove_trailing_chars(udev->rules_path, '/');
continue;
}
}
@@ -286,19 +218,15 @@ struct udev *udev_new(void)
if (env != NULL) {
free(udev->dev_path);
udev->dev_path = strdup(env);
- remove_trailing_chars(udev->dev_path, '/');
+ util_remove_trailing_chars(udev->dev_path, '/');
}
env = getenv("UDEV_LOG");
if (env != NULL)
- udev->log_priority = log_priority(env);
+ udev->log_priority = util_log_priority(env);
if (udev->dev_path == NULL || udev->sys_path == NULL)
goto err;
-
- selinux_init(udev);
- sysfs_init();
-
info(udev, "context %p created\n", udev);
info(udev, "log_priority=%d\n", udev->log_priority);
info(udev, "config_file='%s'\n", config_file);
@@ -306,7 +234,6 @@ struct udev *udev_new(void)
info(udev, "sys_path='%s'\n", udev->sys_path);
if (udev->rules_path != NULL)
info(udev, "rules_path='%s'\n", udev->rules_path);
-
free(config_file);
return udev;
err:
@@ -347,8 +274,6 @@ void udev_unref(struct udev *udev)
udev->refcount--;
if (udev->refcount > 0)
return;
- sysfs_cleanup();
- selinux_exit(udev);
free(udev->dev_path);
free(udev->sys_path);
free(udev->rules_path);
@@ -361,8 +286,7 @@ void udev_unref(struct udev *udev)
* @udev: udev library context
* @log_fn: function to be called for logging messages
*
- * The built-in logging, which writes to stderr if the
- * LIBUDEV_DEBUG environment variable is set, can be
+ * The built-in logging, which writes to stderr, it can be
* overridden by a custom function, to plug log messages
* into the users logging functionality.
*