chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: add new --vacuum-size= and --vacuum-time= commands to clean up journal...
[elogind.git]
/
src
/
udev
/
udev-node.c
diff --git
a/src/udev/udev-node.c
b/src/udev/udev-node.c
index c1646037952f0f464d7f366bfc22b8897dce1beb..030e45919895c427d9bfc3ad28e96b3ce3d839b7 100644
(file)
--- a/
src/udev/udev-node.c
+++ b/
src/udev/udev-node.c
@@
-88,11
+88,11
@@
static int node_symlink(struct udev_device *dev, const char *node, const char *s
err = mkdir_parents_label(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
err = mkdir_parents_label(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
-
label_context_set
(slink, S_IFLNK);
+
mac_selinux_create_file_prepare
(slink, S_IFLNK);
err = symlink(target, slink);
if (err != 0)
err = -errno;
err = symlink(target, slink);
if (err != 0)
err = -errno;
-
label_context
_clear();
+
mac_selinux_create_file
_clear();
} while (err == -ENOENT);
if (err == 0)
goto exit;
} while (err == -ENOENT);
if (err == 0)
goto exit;
@@
-105,11
+105,11
@@
static int node_symlink(struct udev_device *dev, const char *node, const char *s
err = mkdir_parents_label(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
err = mkdir_parents_label(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
-
label_context_set
(slink_tmp, S_IFLNK);
+
mac_selinux_create_file_prepare
(slink_tmp, S_IFLNK);
err = symlink(target, slink_tmp);
if (err != 0)
err = -errno;
err = symlink(target, slink_tmp);
if (err != 0)
err = -errno;
-
label_context
_clear();
+
mac_selinux_create_file
_clear();
} while (err == -ENOENT);
if (err != 0) {
log_error("symlink '%s' '%s' failed: %m", target, slink_tmp);
} while (err == -ENOENT);
if (err != 0) {
log_error("symlink '%s' '%s' failed: %m", target, slink_tmp);
@@
-281,8
+281,12
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) {
log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) {
log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
- chmod(devnode, mode);
- chown(devnode, uid, gid);
+ err = chmod(devnode, mode);
+ if (err < 0)
+ log_warning("setting mode of %s to %#o failed: %m", devnode, mode);
+ err = chown(devnode, uid, gid);
+ if (err < 0)
+ log_warning("setting owner of %s to uid=%u, gid=%u failed: %m", devnode, uid, gid);
} else {
log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
}
} else {
log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
}
@@
-290,21
+294,26
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
/* apply SECLABEL{$module}=$label */
udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
const char *name, *label;
/* apply SECLABEL{$module}=$label */
udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
const char *name, *label;
+ int r;
name = udev_list_entry_get_name(entry);
label = udev_list_entry_get_value(entry);
if (streq(name, "selinux")) {
selinux = true;
name = udev_list_entry_get_name(entry);
label = udev_list_entry_get_value(entry);
if (streq(name, "selinux")) {
selinux = true;
- if (label_apply(devnode, label) < 0)
- log_error("SECLABEL: failed to set SELinux label '%s'", label);
+
+ r = mac_selinux_apply(devnode, label);
+ if (r < 0)
+ log_error("SECLABEL: failed to set SELinux label '%s': %s", label, strerror(-r));
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
- if (smack_label_path(devnode, label) < 0)
- log_error("SECLABEL: failed to set SMACK label '%s'", label);
+
+ r = mac_smack_apply(devnode, label);
+ if (r < 0)
+ log_error("SECLABEL: failed to set SMACK label '%s': %s", label, strerror(-r));
else
log_debug("SECLABEL: set SMACK label '%s'", label);
else
log_debug("SECLABEL: set SMACK label '%s'", label);
@@
-314,9
+323,9
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
/* set the defaults */
if (!selinux)
/* set the defaults */
if (!selinux)
-
label
_fix(devnode, true, false);
+
mac_selinux
_fix(devnode, true, false);
if (!smack)
if (!smack)
-
smack_label_path
(devnode, NULL);
+
mac_smack_apply
(devnode, NULL);
}
/* always update timestamp when we re-use the node, like on media change events */
}
/* always update timestamp when we re-use the node, like on media change events */