diff options
| -rw-r--r-- | udev_db.c | 6 | ||||
| -rw-r--r-- | udev_rules_parse.c | 2 | ||||
| -rw-r--r-- | udev_utils_file.c | 7 | ||||
| -rw-r--r-- | udevd.c | 2 |
4 files changed, 15 insertions, 2 deletions
@@ -144,8 +144,12 @@ int udev_db_add_device(struct udevice *udev) */ if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) && !udev->partitions && !udev->ignore_remove) { + int ret; dbg("nothing interesting to store, create symlink"); - if (symlink(udev->name, filename) != 0) { + selinux_setfscreatecon(filename, NULL, S_IFLNK); + ret = symlink(udev->name, filename); + selinux_resetfscreatecon(); + if (ret != 0) { err("unable to create db link '%s': %s", filename, strerror(errno)); return -1; } diff --git a/udev_rules_parse.c b/udev_rules_parse.c index 9e435819f0..d2392c36e0 100644 --- a/udev_rules_parse.c +++ b/udev_rules_parse.c @@ -745,7 +745,9 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names) strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename)); if (stat(filename, &statbuf) != 0) { create_path(filename); + selinux_setfscreatecon(filename, NULL, S_IFDIR|0755); mkdir(filename, 0755); + selinux_resetfscreatecon(); } add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX); diff --git a/udev_utils_file.c b/udev_utils_file.c index 0ceefe1720..9ab34705e2 100644 --- a/udev_utils_file.c +++ b/udev_utils_file.c @@ -35,6 +35,7 @@ int create_path(const char *path) char p[PATH_SIZE]; char *pos; struct stat stats; + int ret; strlcpy(p, path, sizeof(p)); pos = strrchr(p, '/'); @@ -53,8 +54,12 @@ int create_path(const char *path) return -1; dbg("mkdir '%s'", p); - if (mkdir(p, 0755) == 0) + selinux_setfscreatecon(p, NULL, S_IFDIR|0755); + ret = mkdir(p, 0755); + selinux_resetfscreatecon(); + if (ret == 0) return 0; + if (errno == EEXIST) if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR) return 0; @@ -168,7 +168,9 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st delete_path(filename_failed); create_path(filename); + selinux_setfscreatecon(filename, NULL, S_IFLNK); symlink(msg->devpath, filename); + selinux_resetfscreatecon(); break; case EVENT_FINISHED: if (msg->devpath_old != NULL) { |