summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-05-31 12:40:20 +0200
committerKay Sievers <kay@vrfy.org>2012-05-31 12:40:20 +0200
commitd2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a (patch)
treeb1a4773022e0904f6e023bcff832d897ed46c893 /src/udev
parent051d68786bd5bfe87e7cc0c1d68ec4be83eb662a (diff)
mkdir: append _label to all mkdir() calls that explicitly set the selinux context
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin-firmware.c2
-rw-r--r--src/udev/udev-node.c6
-rw-r--r--src/udev/udev-watch.c2
-rw-r--r--src/udev/udevd.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
index 56dc8fcaa9..69e1db980a 100644
--- a/src/udev/udev-builtin-firmware.c
+++ b/src/udev/udev-builtin-firmware.c
@@ -121,7 +121,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
/* This link indicates the missing firmware file and the associated device */
log_debug("did not find firmware file '%s'\n", firmware);
do {
- err = mkdir_parents(misspath, 0755);
+ err = mkdir_parents_label(misspath, 0755);
if (err != 0 && err != -ENOENT)
break;
err = symlink(udev_device_get_devpath(dev), misspath);
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 3c9846f158..2ef6341a2f 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -100,7 +100,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
} else {
log_debug("creating symlink '%s' to '%s'\n", slink, target);
do {
- err = mkdir_parents(slink, 0755);
+ err = mkdir_parents_label(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
label_context_set(slink, S_IFLNK);
@@ -117,7 +117,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
unlink(slink_tmp);
do {
- err = mkdir_parents(slink_tmp, 0755);
+ err = mkdir_parents_label(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
label_context_set(slink_tmp, S_IFLNK);
@@ -226,7 +226,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
do {
int fd;
- err = mkdir_parents(filename, 0755);
+ err = mkdir_parents_label(filename, 0755);
if (err != 0 && err != -ENOENT)
break;
fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 1091ec8d69..04609a776f 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -111,7 +111,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
}
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
- mkdir_parents(filename, 0755);
+ mkdir_parents_label(filename, 0755);
unlink(filename);
symlink(udev_device_get_id_filename(dev), filename);
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index f6707a5ccb..131d12d1b1 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -850,7 +850,7 @@ static void static_dev_create_from_modules(struct udev *udev)
continue;
util_strscpyl(filename, sizeof(filename), "/dev/", devname, NULL);
- mkdir_parents(filename, 0755);
+ mkdir_parents_label(filename, 0755);
label_context_set(filename, mode);
log_debug("mknod '%s' %c%u:%u\n", filename, type, maj, min);
if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST)
@@ -896,7 +896,7 @@ static int convert_db(struct udev *udev)
return 0;
/* make sure we do not get here again */
- mkdir_parents("/run/udev/data", 0755);
+ mkdir_parents_label("/run/udev/data", 0755);
mkdir(filename, 0755);
/* old database */