summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--TODO2
-rw-r--r--src/libudev/libudev-device-private.c7
-rw-r--r--src/libudev/libudev-private.h6
-rw-r--r--src/libudev/libudev-util-private.c239
-rw-r--r--src/libudev/libudev-util.c161
-rw-r--r--src/login/logind-user-dbus.c2
-rw-r--r--src/shared/mkdir.c18
-rw-r--r--src/test/test-udev.c2
-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
13 files changed, 194 insertions, 263 deletions
diff --git a/Makefile.am b/Makefile.am
index 90c225ec01..1371a77536 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1337,7 +1337,6 @@ noinst_LTLIBRARIES += \
libudev_private_la_SOURCES =\
$(libudev_la_SOURCES) \
- src/libudev/libudev-util-private.c \
src/libudev/libudev-device-private.c \
src/libudev/libudev-queue-private.c
@@ -1451,6 +1450,7 @@ libudev_core_la_CFLAGS = \
libudev_core_la_LIBADD = \
libudev-private.la \
+ libsystemd-label.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@ -1503,6 +1503,7 @@ test_libudev_SOURCES = \
src/test/test-libudev.c
test_libudev_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la \
libudev.la
@@ -1522,6 +1523,7 @@ test_udev_CPPFLAGS =\
$(libudev_core_la_CPPFLAGS)
test_udev_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
@@ -3249,7 +3251,7 @@ upload: all distcheck
doc-sync: all
rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
- rsync -av --delete man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+ rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
diff --git a/TODO b/TODO
index d2145f99d1..d83a53a741 100644
--- a/TODO
+++ b/TODO
@@ -19,8 +19,6 @@ Features:
* udev: unify selinux stuff with systemd
-* udev: move udev's recursive mkdir to shared/
-
* udev: find a way to tell udev to not cancel firmware requests when running in initramfs
* udev: scsi_id -> sg3_utils -> kill scsi_id
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index a4dfa9bd39..2c50e174c6 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -25,7 +25,6 @@
static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
{
const char *id;
- struct udev *udev = udev_device_get_udev(dev);
char filename[UTIL_PATH_SIZE];
id = udev_device_get_id_filename(dev);
@@ -36,7 +35,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
if (add) {
int fd;
- util_create_path(udev, filename);
+ mkdir_parents(filename, 0755);
fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
if (fd >= 0)
close(fd);
@@ -96,9 +95,9 @@ static bool device_has_info(struct udev_device *udev_device)
int udev_device_update_db(struct udev_device *udev_device)
{
+ struct udev *udev = udev_device_get_udev(udev_device);
bool has_info;
const char *id;
- struct udev *udev = udev_device_get_udev(udev_device);
char filename[UTIL_PATH_SIZE];
char filename_tmp[UTIL_PATH_SIZE];
FILE *f;
@@ -120,7 +119,7 @@ int udev_device_update_db(struct udev_device *udev_device)
/* write a database file */
util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
- util_create_path(udev, filename_tmp);
+ mkdir_parents(filename_tmp, 0755);
f = fopen(filename_tmp, "we");
if (f == NULL) {
err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index 60bffa469a..953f589bff 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -16,9 +16,11 @@
#include <signal.h>
#include <stdint.h>
#include <stdbool.h>
+
+#include "libudev.h"
#include "macro.h"
#include "util.h"
-#include "libudev.h"
+#include "mkdir.h"
#define READ_END 0
#define WRITE_END 1
@@ -164,8 +166,6 @@ unsigned int util_string_hash32(const char *key);
uint64_t util_string_bloom64(const char *str);
/* libudev-util-private.c */
-int util_create_path(struct udev *udev, const char *path);
-int util_create_path_selinux(struct udev *udev, const char *path);
int util_delete_path(struct udev *udev, const char *path);
uid_t util_lookup_user(struct udev *udev, const char *user);
gid_t util_lookup_group(struct udev *udev, const char *group);
diff --git a/src/libudev/libudev-util-private.c b/src/libudev/libudev-util-private.c
deleted file mode 100644
index 44ff02cc33..0000000000
--- a/src/libudev/libudev-util-private.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * libudev - interface to udev device information
- *
- * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/param.h>
-
-#include "libudev.h"
-#include "libudev-private.h"
-
-static int create_path(struct udev *udev, const char *path, bool selinux)
-{
- char p[UTIL_PATH_SIZE];
- char *pos;
- struct stat stats;
- int err;
-
- util_strscpy(p, sizeof(p), path);
- pos = strrchr(p, '/');
- if (pos == NULL)
- return 0;
- while (pos != p && pos[-1] == '/')
- pos--;
- if (pos == p)
- return 0;
- pos[0] = '\0';
-
- if (stat(p, &stats) == 0) {
- if ((stats.st_mode & S_IFMT) == S_IFDIR)
- return 0;
- else
- return -ENOTDIR;
- }
-
- err = util_create_path(udev, p);
- if (err != 0)
- return err;
-
- if (selinux)
- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
- err = mkdir(p, 0755);
- if (err != 0) {
- err = -errno;
- if (err == -EEXIST && stat(p, &stats) == 0) {
- if ((stats.st_mode & S_IFMT) == S_IFDIR)
- err = 0;
- else
- err = -ENOTDIR;
- }
- }
- if (selinux)
- udev_selinux_resetfscreatecon(udev);
- return err;
-}
-
-int util_create_path(struct udev *udev, const char *path)
-{
- return create_path(udev, path, false);
-}
-
-int util_create_path_selinux(struct udev *udev, const char *path)
-{
- return create_path(udev, path, true);
-}
-
-int util_delete_path(struct udev *udev, const char *path)
-{
- char p[UTIL_PATH_SIZE];
- char *pos;
- int err = 0;
-
- if (path[0] == '/')
- while(path[1] == '/')
- path++;
- util_strscpy(p, sizeof(p), path);
- pos = strrchr(p, '/');
- if (pos == p || pos == NULL)
- return 0;
-
- for (;;) {
- *pos = '\0';
- pos = strrchr(p, '/');
-
- /* don't remove the last one */
- if ((pos == p) || (pos == NULL))
- break;
-
- err = rmdir(p);
- if (err < 0) {
- if (errno == ENOENT)
- err = 0;
- break;
- }
- }
- return err;
-}
-
-uid_t util_lookup_user(struct udev *udev, const char *user)
-{
- char *endptr;
- struct passwd pwbuf;
- struct passwd *pw;
- uid_t uid;
- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *buf = alloca(buflen);
-
- if (strcmp(user, "root") == 0)
- return 0;
- uid = strtoul(user, &endptr, 10);
- if (endptr[0] == '\0')
- return uid;
-
- errno = getpwnam_r(user, &pwbuf, buf, buflen, &pw);
- if (pw != NULL)
- return pw->pw_uid;
- if (errno == 0 || errno == ENOENT || errno == ESRCH)
- err(udev, "specified user '%s' unknown\n", user);
- else
- err(udev, "error resolving user '%s': %m\n", user);
- return 0;
-}
-
-gid_t util_lookup_group(struct udev *udev, const char *group)
-{
- char *endptr;
- struct group grbuf;
- struct group *gr;
- gid_t gid = 0;
- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *buf = NULL;
-
- if (strcmp(group, "root") == 0)
- return 0;
- gid = strtoul(group, &endptr, 10);
- if (endptr[0] == '\0')
- return gid;
- gid = 0;
- for (;;) {
- char *newbuf;
-
- newbuf = realloc(buf, buflen);
- if (!newbuf)
- break;
- buf = newbuf;
- errno = getgrnam_r(group, &grbuf, buf, buflen, &gr);
- if (gr != NULL) {
- gid = gr->gr_gid;
- } else if (errno == ERANGE) {
- buflen *= 2;
- continue;
- } else if (errno == 0 || errno == ENOENT || errno == ESRCH) {
- err(udev, "specified group '%s' unknown\n", group);
- } else {
- err(udev, "error resolving group '%s': %m\n", group);
- }
- break;
- }
- free(buf);
- return gid;
-}
-
-/* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
-int util_resolve_subsys_kernel(struct udev *udev, const char *string,
- char *result, size_t maxsize, int read_value)
-{
- char temp[UTIL_PATH_SIZE];
- char *subsys;
- char *sysname;
- struct udev_device *dev;
- char *attr;
-
- if (string[0] != '[')
- return -1;
-
- util_strscpy(temp, sizeof(temp), string);
-
- subsys = &temp[1];
-
- sysname = strchr(subsys, '/');
- if (sysname == NULL)
- return -1;
- sysname[0] = '\0';
- sysname = &sysname[1];
-
- attr = strchr(sysname, ']');
- if (attr == NULL)
- return -1;
- attr[0] = '\0';
- attr = &attr[1];
- if (attr[0] == '/')
- attr = &attr[1];
- if (attr[0] == '\0')
- attr = NULL;
-
- if (read_value && attr == NULL)
- return -1;
-
- dev = udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
- if (dev == NULL)
- return -1;
-
- if (read_value) {
- const char *val;
-
- val = udev_device_get_sysattr_value(dev, attr);
- if (val != NULL)
- util_strscpy(result, maxsize, val);
- else
- result[0] = '\0';
- dbg(udev, "value '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
- } else {
- size_t l;
- char *s;
-
- s = result;
- l = util_strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
- if (attr != NULL)
- util_strpcpyl(&s, l, "/", attr, NULL);
- dbg(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
- }
- udev_device_unref(dev);
- return 0;
-}
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 24d402cd2a..aed4393d58 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -19,7 +19,10 @@
#include <ctype.h>
#include <fcntl.h>
#include <time.h>
+#include <pwd.h>
+#include <grp.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include "libudev.h"
#include "libudev-private.h"
@@ -29,6 +32,164 @@
* @short_description: utils
*/
+int util_delete_path(struct udev *udev, const char *path)
+{
+ char p[UTIL_PATH_SIZE];
+ char *pos;
+ int err = 0;
+
+ if (path[0] == '/')
+ while(path[1] == '/')
+ path++;
+ util_strscpy(p, sizeof(p), path);
+ pos = strrchr(p, '/');
+ if (pos == p || pos == NULL)
+ return 0;
+
+ for (;;) {
+ *pos = '\0';
+ pos = strrchr(p, '/');
+
+ /* don't remove the last one */
+ if ((pos == p) || (pos == NULL))
+ break;
+
+ err = rmdir(p);
+ if (err < 0) {
+ if (errno == ENOENT)
+ err = 0;
+ break;
+ }
+ }
+ return err;
+}
+
+uid_t util_lookup_user(struct udev *udev, const char *user)
+{
+ char *endptr;
+ struct passwd pwbuf;
+ struct passwd *pw;
+ uid_t uid;
+ size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ char *buf = alloca(buflen);
+
+ if (strcmp(user, "root") == 0)
+ return 0;
+ uid = strtoul(user, &endptr, 10);
+ if (endptr[0] == '\0')
+ return uid;
+
+ errno = getpwnam_r(user, &pwbuf, buf, buflen, &pw);
+ if (pw != NULL)
+ return pw->pw_uid;
+ if (errno == 0 || errno == ENOENT || errno == ESRCH)
+ err(udev, "specified user '%s' unknown\n", user);
+ else
+ err(udev, "error resolving user '%s': %m\n", user);
+ return 0;
+}
+
+gid_t util_lookup_group(struct udev *udev, const char *group)
+{
+ char *endptr;
+ struct group grbuf;
+ struct group *gr;
+ gid_t gid = 0;
+ size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ char *buf = NULL;
+
+ if (strcmp(group, "root") == 0)
+ return 0;
+ gid = strtoul(group, &endptr, 10);
+ if (endptr[0] == '\0')
+ return gid;
+ gid = 0;
+ for (;;) {
+ char *newbuf;
+
+ newbuf = realloc(buf, buflen);
+ if (!newbuf)
+ break;
+ buf = newbuf;
+ errno = getgrnam_r(group, &grbuf, buf, buflen, &gr);
+ if (gr != NULL) {
+ gid = gr->gr_gid;
+ } else if (errno == ERANGE) {
+ buflen *= 2;
+ continue;
+ } else if (errno == 0 || errno == ENOENT || errno == ESRCH) {
+ err(udev, "specified group '%s' unknown\n", group);
+ } else {
+ err(udev, "error resolving group '%s': %m\n", group);
+ }
+ break;
+ }
+ free(buf);
+ return gid;
+}
+
+/* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
+int util_resolve_subsys_kernel(struct udev *udev, const char *string,
+ char *result, size_t maxsize, int read_value)
+{
+ char temp[UTIL_PATH_SIZE];
+ char *subsys;
+ char *sysname;
+ struct udev_device *dev;
+ char *attr;
+
+ if (string[0] != '[')
+ return -1;
+
+ util_strscpy(temp, sizeof(temp), string);
+
+ subsys = &temp[1];
+
+ sysname = strchr(subsys, '/');
+ if (sysname == NULL)
+ return -1;
+ sysname[0] = '\0';
+ sysname = &sysname[1];
+
+ attr = strchr(sysname, ']');
+ if (attr == NULL)
+ return -1;
+ attr[0] = '\0';
+ attr = &attr[1];
+ if (attr[0] == '/')
+ attr = &attr[1];
+ if (attr[0] == '\0')
+ attr = NULL;
+
+ if (read_value && attr == NULL)
+ return -1;
+
+ dev = udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
+ if (dev == NULL)
+ return -1;
+
+ if (read_value) {
+ const char *val;
+
+ val = udev_device_get_sysattr_value(dev, attr);
+ if (val != NULL)
+ util_strscpy(result, maxsize, val);
+ else
+ result[0] = '\0';
+ dbg(udev, "value '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
+ } else {
+ size_t l;
+ char *s;
+
+ s = result;
+ l = util_strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
+ if (attr != NULL)
+ util_strpcpyl(&s, l, "/", attr, NULL);
+ dbg(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
+ }
+ udev_device_unref(dev);
+ return 0;
+}
ssize_t util_get_sys_core_link_value(struct udev *udev, const char *slink, const char *syspath, char *value, size_t size)
{
char path[UTIL_PATH_SIZE];
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 21b608d526..ddf9d9d5cf 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -189,7 +189,7 @@ static int bus_user_append_idle_hint_since(DBusMessageIter *i, const char *prope
return 0;
}
-static bus_user_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
+static int bus_user_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
User *u = data;
char *t;
int r;
diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index 3d98221296..fef674c1b3 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -53,13 +53,24 @@ int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
}
int mkdir_parents(const char *path, mode_t mode) {
+ struct stat st;
const char *p, *e;
assert(path);
- /* Creates every parent directory in the path except the last
- * component. */
+ /* return immediately if directory exists */
+ e = strrchr(path, '/');
+ if (!e)
+ return -EINVAL;
+ p = strndupa(path, e - path);
+ if (stat(p, &st) >= 0) {
+ if ((st.st_mode & S_IFMT) == S_IFDIR)
+ return 0;
+ else
+ return -ENOTDIR;
+ }
+ /* create every parent directory in the path, except the last component */
p = path + strspn(path, "/");
for (;;) {
int r;
@@ -73,11 +84,10 @@ int mkdir_parents(const char *path, mode_t mode) {
if (*p == 0)
return 0;
- if (!(t = strndup(path, e - path)))
+ if (!(t = strndupa(path, e - path)))
return -ENOMEM;
r = label_mkdir(t, mode);
- free(t);
if (r < 0 && errno != EEXIST)
return -errno;
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index b843e5f648..a39ba72114 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
mode |= S_IFCHR;
if (strcmp(action, "remove") != 0) {
- util_create_path(udev, udev_device_get_devnode(dev));
+ mkdir_parents(udev_device_get_devnode(dev), 0755);
mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
} else {
unlink(udev_device_get_devnode(dev));
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
index bd2716fdc8..56dc8fcaa9 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 = util_create_path(udev, misspath);
+ err = mkdir_parents(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 26a43e9623..20aa7c865d 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 = util_create_path_selinux(udev, slink);
+ err = mkdir_parents(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
udev_selinux_setfscreatecon(udev, 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 = util_create_path_selinux(udev, slink_tmp);
+ err = mkdir_parents(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
udev_selinux_setfscreatecon(udev, 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 = util_create_path(udev, filename);
+ err = mkdir_parents(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 7d5b30bd68..1091ec8d69 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);
- util_create_path(udev, filename);
+ mkdir_parents(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 d6de2aa222..513d1de343 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -857,7 +857,7 @@ static void static_dev_create_from_modules(struct udev *udev)
continue;
util_strscpyl(filename, sizeof(filename), "/dev/", devname, NULL);
- util_create_path_selinux(udev, filename);
+ mkdir_parents(filename, 0755);
udev_selinux_setfscreatecon(udev, filename, mode);
log_debug("mknod '%s' %c%u:%u\n", filename, type, maj, min);
if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST)
@@ -938,7 +938,7 @@ static int convert_db(struct udev *udev)
return 0;
/* make sure we do not get here again */
- util_create_path(udev, "/run/udev/data");
+ mkdir_parents("/run/udev/data", 0755);
mkdir(filename, 0755);
/* old database */