/*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <string.h>
#include <stdio.h>
#include <stddef.h>
+#include <stdbool.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <grp.h>
#include <dirent.h>
+#include <sys/time.h>
#include <sys/stat.h>
#include <sys/types.h>
#define TMP_FILE_EXT ".udev-tmp"
-/* reverse mapping from the device file name to the devpath */
-static int name_index(struct udev *udev, const char *devpath, const char *name, int add, int test)
-{
- char device[UTIL_PATH_SIZE];
- char filename[UTIL_PATH_SIZE * 2];
- size_t devlen = strlen(udev_get_dev_path(udev))+1;
- size_t start;
- int fd;
-
- /* directory with device name */
- util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
- start = util_strlcat(filename, "/.udev/names/", sizeof(filename));
- util_strlcat(filename, &name[devlen], sizeof(filename));
- util_path_encode(&filename[start], sizeof(filename) - start);
- /* entry with the devpath */
- util_strlcpy(device, devpath, sizeof(device));
- util_path_encode(device, sizeof(device));
- util_strlcat(filename, "/", sizeof(filename));
- util_strlcat(filename, device, sizeof(filename));
-
- if (add) {
- info(udev, "creating index: '%s'\n", filename);
- util_create_path(udev, filename);
- fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
- if (fd > 0)
- close(fd);
- } else {
- info(udev, "removing index: '%s'\n", filename);
- unlink(filename);
- util_delete_path(udev, filename);
- }
- return 0;
-}
-
-int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid)
+int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid)
{
struct udev *udev = udev_device_get_udev(dev);
- char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
+ dev_t devnum = udev_device_get_devnum(dev);
struct stat stats;
- int preserve = 0;
int err = 0;
- if (major(devnum) == 0)
- devnum = udev_device_get_devnum(dev);
if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
mode |= S_IFBLK;
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
info(udev, "preserve file '%s', because it has correct dev_t\n", file);
- preserve = 1;
- udev_selinux_lsetfilecon(udev, file, mode);
+ if (stats.st_mode != mode || stats.st_uid != uid || stats.st_gid != gid) {
+ info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
+ } else {
+ info(udev, "preserve permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
+ }
+ /*
+ * Set initial selinux file context only on add events.
+ * We set the proper context on bootup (triger) or for newly
+ * added devices, but we don't change it later, in case
+ * something else has set a custom context in the meantime.
+ */
+ if (strcmp(udev_device_get_action(dev), "add") == 0)
+ udev_selinux_lsetfilecon(udev, file, mode);
+ /* always update timestamp when we re-use the node, like on media change events */
+ utimensat(AT_FDCWD, file, NULL, 0);
} else {
+ char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
+
info(udev, "atomically replace existing file '%s'\n", file);
- util_strlcpy(file_tmp, file, sizeof(file_tmp));
- util_strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp));
+ util_strscpyl(file_tmp, sizeof(file_tmp), file, TMP_FILE_EXT, NULL);
unlink(file_tmp);
udev_selinux_setfscreatecon(udev, file_tmp, mode);
err = mknod(file_tmp, mode, devnum);
udev_selinux_resetfscreatecon(udev);
if (err != 0) {
- err(udev, "mknod(%s, %#o, %u, %u) failed: %m\n",
- file_tmp, mode, major(devnum), minor(devnum));
+ err(udev, "mknod '%s' %u:%u %#o failed: %m\n",
+ file_tmp, major(devnum), minor(devnum), mode);
goto exit;
}
err = rename(file_tmp, file);
if (err != 0) {
- err(udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
+ err(udev, "rename '%s' '%s' failed: %m\n", file_tmp, file);
unlink(file_tmp);
+ goto exit;
}
+ info(udev, "set permissions '%s' %#o uid=%u gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
}
} else {
- info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
- udev_selinux_setfscreatecon(udev, file, mode);
- err = mknod(file, mode, devnum);
- udev_selinux_resetfscreatecon(udev);
- if (err != 0) {
- err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
- goto exit;
- }
- }
-
- if (!preserve || stats.st_mode != mode) {
- info(udev, "chmod(%s, %#o)\n", file, mode);
- err = chmod(file, mode);
- if (err != 0) {
- err(udev, "chmod(%s, %#o) failed: %m\n", file, mode);
- goto exit;
- }
- }
-
- if (!preserve || stats.st_uid != uid || stats.st_gid != gid) {
- info(udev, "chown(%s, %u, %u)\n", file, uid, gid);
- err = chown(file, uid, gid);
- if (err != 0) {
- err(udev, "chown(%s, %u, %u) failed: %m\n", file, uid, gid);
- goto exit;
- }
+ info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode);
+ do {
+ err = util_create_path_selinux(udev, file);
+ if (err != 0 && err != -ENOENT)
+ break;
+ udev_selinux_setfscreatecon(udev, file, mode);
+ err = mknod(file, mode, devnum);
+ if (err != 0)
+ err = -errno;
+ udev_selinux_resetfscreatecon(udev);
+ } while (err == -ENOENT);
+ if (err != 0)
+ err(udev, "mknod '%s' %u:%u %#o' failed: %m\n", file, major(devnum), minor(devnum), mode);
+ info(udev, "set permissions '%s' %#o uid=%u gid=%u\n", file, mode, uid, gid);
+ chmod(file, mode);
+ chown(file, uid, gid);
}
exit:
return err;
static int node_symlink(struct udev *udev, const char *node, const char *slink)
{
struct stat stats;
- char target[UTIL_PATH_SIZE] = "";
+ char target[UTIL_PATH_SIZE];
+ char *s;
+ size_t l;
char slink_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
int i = 0;
int tail = 0;
- int len;
int err = 0;
/* use relative link */
+ target[0] = '\0';
while (node[i] && (node[i] == slink[i])) {
if (node[i] == '/')
tail = i+1;
i++;
}
+ s = target;
+ l = sizeof(target);
while (slink[i] != '\0') {
if (slink[i] == '/')
- util_strlcat(target, "../", sizeof(target));
+ l = util_strpcpy(&s, l, "../");
i++;
}
- util_strlcat(target, &node[tail], sizeof(target));
+ l = util_strscpy(s, l, &node[tail]);
+ if (l == 0) {
+ err = -EINVAL;
+ goto exit;
+ }
/* preserve link with correct target, do not replace node of other device */
if (lstat(slink, &stats) == 0) {
info(udev, "found existing node instead of symlink '%s'\n", slink);
if (lstat(node, &stats2) == 0) {
if ((stats.st_mode & S_IFMT) == (stats2.st_mode & S_IFMT) &&
- stats.st_rdev == stats2.st_rdev) {
+ stats.st_rdev == stats2.st_rdev && stats.st_ino != stats2.st_ino) {
info(udev, "replace device node '%s' with symlink to our node '%s'\n",
slink, node);
} else {
}
} else if (S_ISLNK(stats.st_mode)) {
char buf[UTIL_PATH_SIZE];
+ int len;
- info(udev, "found existing symlink '%s'\n", slink);
+ dbg(udev, "found existing symlink '%s'\n", slink);
len = readlink(slink, buf, sizeof(buf));
- if (len > 0) {
+ if (len > 0 && len < (int)sizeof(buf)) {
buf[len] = '\0';
if (strcmp(target, buf) == 0) {
info(udev, "preserve already existing symlink '%s' to '%s'\n",
slink, target);
udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
+ utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
goto exit;
}
}
}
} else {
info(udev, "creating symlink '%s' to '%s'\n", slink, target);
- udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
- err = symlink(target, slink);
- udev_selinux_resetfscreatecon(udev);
+ do {
+ err = util_create_path_selinux(udev, slink);
+ if (err != 0 && err != -ENOENT)
+ break;
+ udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+ err = symlink(target, slink);
+ if (err != 0)
+ err = -errno;
+ udev_selinux_resetfscreatecon(udev);
+ } while (err == -ENOENT);
if (err == 0)
goto exit;
}
info(udev, "atomically replace '%s'\n", slink);
- util_strlcpy(slink_tmp, slink, sizeof(slink_tmp));
- util_strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
+ util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
unlink(slink_tmp);
- udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
- err = symlink(target, slink_tmp);
- udev_selinux_resetfscreatecon(udev);
+ do {
+ err = util_create_path_selinux(udev, slink_tmp);
+ if (err != 0 && err != -ENOENT)
+ break;
+ udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
+ err = symlink(target, slink_tmp);
+ if (err != 0)
+ err = -errno;
+ udev_selinux_resetfscreatecon(udev);
+ } while (err == -ENOENT);
if (err != 0) {
- err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
+ err(udev, "symlink '%s' '%s' failed: %m\n", target, slink_tmp);
goto exit;
}
err = rename(slink_tmp, slink);
if (err != 0) {
- err(udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink);
+ err(udev, "rename '%s' '%s' failed: %m\n", slink_tmp, slink);
unlink(slink_tmp);
- goto exit;
}
exit:
return err;
}
-static int name_index_get_devices(struct udev *udev, const char *name, struct udev_list_node *dev_list)
+/* find device node of device with highest priority */
+static const char *link_find_prioritized(struct udev_device *dev, bool add, const char *stackdir, char *buf, size_t bufsize)
{
- char dirname[PATH_MAX];
- size_t devlen = strlen(udev_get_dev_path(udev))+1;
- size_t start;
+ struct udev *udev = udev_device_get_udev(dev);
DIR *dir;
- int count = 0;
-
- util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
- start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname));
- util_strlcat(dirname, &name[devlen], sizeof(dirname));
- util_path_encode(&dirname[start], sizeof(dirname) - start);
- dir = opendir(dirname);
- if (dir == NULL) {
- info(udev, "no index directory '%s': %m\n", dirname);
- count = -1;
- goto out;
+ int priority = 0;
+ const char *target = NULL;
+
+ if (add) {
+ priority = udev_device_get_devlink_priority(dev);
+ util_strscpy(buf, bufsize, udev_device_get_devnode(dev));
+ target = buf;
}
- info(udev, "found index directory '%s'\n", dirname);
- while (1) {
- struct dirent *ent;
- char device[UTIL_PATH_SIZE];
+ dir = opendir(stackdir);
+ if (dir == NULL)
+ return target;
+ for (;;) {
+ struct udev_device *dev_db;
+ struct dirent *dent;
- ent = readdir(dir);
- if (ent == NULL || ent->d_name[0] == '\0')
+ dent = readdir(dir);
+ if (dent == NULL || dent->d_name[0] == '\0')
break;
- if (ent->d_name[0] == '.')
+ if (dent->d_name[0] == '.')
continue;
- util_strlcpy(device, udev_get_sys_path(udev), sizeof(device));
- util_strlcat(device, ent->d_name, sizeof(device));
- util_path_decode(device);
- udev_list_entry_add(udev, dev_list, device, NULL, 1, 0);
- count++;
+ info(udev, "found '%s' claiming '%s'\n", dent->d_name, stackdir);
+
+ /* did we find ourself? */
+ if (strcmp(dent->d_name, udev_device_get_id_filename(dev)) == 0)
+ continue;
+
+ dev_db = udev_device_new_from_id_filename(udev, dent->d_name);
+ if (dev_db != NULL) {
+ const char *devnode;
+
+ devnode = udev_device_get_devnode(dev_db);
+ if (devnode != NULL) {
+ dbg(udev, "compare priority of '%s'(%i) > '%s'(%i)\n", target, priority,
+ udev_device_get_devnode(dev_db), udev_device_get_devlink_priority(dev_db));
+ if (target == NULL || udev_device_get_devlink_priority(dev_db) > priority) {
+ info(udev, "'%s' claims priority %i for '%s'\n",
+ udev_device_get_syspath(dev_db), udev_device_get_devlink_priority(dev_db), stackdir);
+ priority = udev_device_get_devlink_priority(dev_db);
+ util_strscpy(buf, bufsize, devnode);
+ target = buf;
+ }
+ }
+ udev_device_unref(dev_db);
+ }
}
closedir(dir);
-out:
- return count;
+ return target;
}
-static int update_link(struct udev_device *dev, const char *slink, int test)
+/* manage "stack of names" with possibly specified device priorities */
+static void link_update(struct udev_device *dev, const char *slink, bool add)
{
struct udev *udev = udev_device_get_udev(dev);
- struct udev_list_node dev_list;
- struct udev_list_entry *dev_entry;
- char target[UTIL_PATH_SIZE] = "";
- int count;
- int priority = 0;
- int rc = 0;
-
- info(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
-
- udev_list_init(&dev_list);
- count = name_index_get_devices(udev, slink, &dev_list);
- info(udev, "found %i devices with name '%s'\n", count, slink);
+ char name_enc[UTIL_PATH_SIZE];
+ char filename[UTIL_PATH_SIZE * 2];
+ char dirname[UTIL_PATH_SIZE];
+ const char *target;
+ char buf[UTIL_PATH_SIZE];
- /* if we don't have a reference, delete it */
- if (count <= 0) {
- info(udev, "no reference left, remove '%s'\n", slink);
- if (!test) {
- unlink(slink);
- util_delete_path(udev, slink);
- }
- goto out;
- }
+ dbg(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
- /* find the device with the highest priority */
- udev_list_entry_foreach(dev_entry, udev_list_get_entry(&dev_list)) {
- const char *syspath;
- struct udev_device *dev_db;
- const char *devnode;
-
- syspath = udev_list_entry_get_name(dev_entry);
- info(udev, "found '%s' for '%s'\n", syspath, slink);
-
- /* did we find ourself? we win, if we have the same priority */
- if (strcmp(udev_device_get_syspath(dev), syspath) == 0) {
- info(udev, "compare (our own) priority of '%s' %i >= %i\n",
- udev_device_get_devpath(dev), udev_device_get_devlink_priority(dev), priority);
- if (strcmp(udev_device_get_devnode(dev), slink) == 0) {
- info(udev, "'%s' is our device node, database inconsistent, skip link update\n",
- udev_device_get_devnode(dev));
- } else if (target[0] == '\0' || udev_device_get_devlink_priority(dev) >= priority) {
- priority = udev_device_get_devlink_priority(dev);
- util_strlcpy(target, udev_device_get_devnode(dev), sizeof(target));
- }
- continue;
- }
+ util_path_encode(&slink[strlen(udev_get_dev_path(udev))+1], name_enc, sizeof(name_enc));
+ util_strscpyl(dirname, sizeof(dirname), udev_get_run_path(udev), "/links/", name_enc, NULL);
+ util_strscpyl(filename, sizeof(filename), dirname, "/", udev_device_get_id_filename(dev), NULL);
- /* another device, read priority from database */
- dev_db = udev_device_new_from_syspath(udev, syspath);
- if (dev_db == NULL)
- continue;
- devnode = udev_device_get_devnode(dev_db);
- if (devnode != NULL) {
- if (strcmp(devnode, slink) == 0) {
- info(udev, "'%s' is a device node of '%s', skip link update\n",
- devnode, syspath);
- } else {
- info(udev, "compare priority of '%s' %i > %i\n",
- udev_device_get_devpath(dev_db),
- udev_device_get_devlink_priority(dev_db),
- priority);
- if (target[0] == '\0' || udev_device_get_devlink_priority(dev_db) > priority) {
- priority = udev_device_get_devlink_priority(dev_db);
- util_strlcpy(target, devnode, sizeof(target));
- }
- }
- }
- udev_device_unref(dev_db);
+ if (!add) {
+ dbg(udev, "removing index: '%s'\n", filename);
+ if (unlink(filename) == 0)
+ rmdir(dirname);
}
- udev_list_cleanup_entries(udev, &dev_list);
- if (target[0] == '\0') {
- info(udev, "no current target for '%s' found\n", slink);
- rc = 1;
- goto out;
+ target = link_find_prioritized(dev, add, dirname, buf, sizeof(buf));
+ if (target == NULL) {
+ info(udev, "no reference left, remove '%s'\n", slink);
+ if (unlink(slink) == 0)
+ util_delete_path(udev, slink);
+ } else {
+ info(udev, "creating link '%s' to '%s'\n", slink, target);
+ node_symlink(udev, target, slink);
}
- /* create symlink to the target with the highest priority */
- info(udev, "'%s' with target '%s' has the highest priority %i, create it\n", slink, target, priority);
- if (!test) {
- util_create_path(udev, slink);
- node_symlink(udev, target, slink);
+ if (add) {
+ int err;
+
+ dbg(udev, "creating index: '%s'\n", filename);
+ do {
+ int fd;
+
+ err = util_create_path(udev, filename);
+ if (err != 0 && err != -ENOENT)
+ break;
+ fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
+ if (fd >= 0)
+ close(fd);
+ else
+ err = -errno;
+ } while (err == -ENOENT);
}
-out:
- return rc;
}
-void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test)
+void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old)
{
struct udev *udev = udev_device_get_udev(dev);
struct udev_list_entry *list_entry;
- const char *devnode_old;
/* update possible left-over symlinks */
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev_old)) {
+ const char *name = udev_list_entry_get_name(list_entry);
struct udev_list_entry *list_entry_current;
+ int found;
+ /* check if old link name still belongs to this device */
+ found = 0;
udev_list_entry_foreach(list_entry_current, udev_device_get_devlinks_list_entry(dev)) {
- if (strcmp(udev_list_entry_get_name(list_entry_current),
- udev_list_entry_get_name(list_entry)) == 0)
- continue;
- }
- /* link does no longer belong to this device */
- info(udev, "update old symlink '%s' no longer belonging to '%s'\n",
- udev_list_entry_get_name(list_entry), udev_device_get_devpath(dev));
- update_link(dev, udev_list_entry_get_name(list_entry), test);
- }
+ const char *name_current = udev_list_entry_get_name(list_entry_current);
- /*
- * if the node name has changed, delete the node,
- * and possibly restore a symlink of another device
- */
- devnode_old = udev_device_get_devnode(dev_old);
- if (devnode_old != NULL) {
- const char *devnode = udev_device_get_devnode(dev);
+ if (strcmp(name, name_current) == 0) {
+ found = 1;
+ break;
+ }
+ }
+ if (found)
+ continue;
- if (devnode != NULL && strcmp(devnode_old, devnode) != 0)
- update_link(dev, devnode_old, test);
+ info(udev, "update old name, '%s' no longer belonging to '%s'\n",
+ name, udev_device_get_devpath(dev));
+ link_update(dev, name, 0);
}
}
-int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid, int test)
+int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
{
struct udev *udev = udev_device_get_udev(dev);
- int i;
- int num;
+ char filename[UTIL_PATH_SIZE];
struct udev_list_entry *list_entry;
int err = 0;
major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
mode, uid, gid);
- util_create_path(udev, udev_device_get_devnode(dev));
- if (!test)
- if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
- err = -1;
- goto exit;
- }
-
- /* create all_partitions if requested */
- num = udev_device_get_num_fake_partitions(dev);
- if (num > 0) {
- info(udev, "creating device partition nodes '%s[1-%i]'\n", udev_device_get_devnode(dev), num);
- if (!test) {
- for (i = 1; i <= num; i++) {
- char partitionname[UTIL_PATH_SIZE];
- dev_t part_devnum;
-
- snprintf(partitionname, sizeof(partitionname), "%s%d",
- udev_device_get_devnode(dev), i);
- partitionname[sizeof(partitionname)-1] = '\0';
- part_devnum = makedev(major(udev_device_get_devnum(dev)),
- minor(udev_device_get_devnum(dev)) + i);
- udev_node_mknod(dev, partitionname, part_devnum, mode, uid, gid);
- }
- }
+ if (udev_node_mknod(dev, NULL, mode, uid, gid) != 0) {
+ err = -1;
+ goto exit;
}
- /* add node and to name index */
- name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 1, test);
+ /* always add /dev/{block,char}/$major:$minor */
+ snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+ udev_get_dev_path(udev),
+ strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+ major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+ node_symlink(udev, udev_device_get_devnode(dev), filename);
/* create/update symlinks, add symlinks to name index */
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
- name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 1, test);
- update_link(dev, udev_list_entry_get_name(list_entry), test);
+ if (udev_list_entry_get_num(list_entry))
+ /* simple unmanaged link name */
+ node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry));
+ else
+ link_update(dev, udev_list_entry_get_name(list_entry), 1);
}
exit:
return err;
}
-extern int udev_node_remove(struct udev_device *dev, int test)
+int udev_node_remove(struct udev_device *dev)
{
struct udev *udev = udev_device_get_udev(dev);
struct udev_list_entry *list_entry;
const char *devnode;
- char partitionname[UTIL_PATH_SIZE];
struct stat stats;
+ struct udev_device *dev_check;
+ char filename[UTIL_PATH_SIZE];
int err = 0;
- int num;
-
- /* remove node from name index */
- name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 0, test);
- /* remove,update symlinks, remove symlinks from name index */
- udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
- name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 0, test);
- update_link(dev, udev_list_entry_get_name(list_entry), test);
- }
+ /* remove/update symlinks, remove symlinks from name index */
+ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev))
+ link_update(dev, udev_list_entry_get_name(list_entry), 0);
devnode = udev_device_get_devnode(dev);
if (devnode == NULL)
- return 0;
+ goto out;
+
if (stat(devnode, &stats) != 0) {
info(udev, "device node '%s' not found\n", devnode);
- return 0;
+ goto out;
}
+
if (stats.st_rdev != udev_device_get_devnum(dev)) {
info(udev, "device node '%s' points to a different device, skip removal\n", devnode);
- return -1;
+ err = -1;
+ goto out;
}
- info(udev, "removing device node '%s'\n", devnode);
- if (!test)
- err = util_unlink_secure(udev, devnode);
- if (err)
- return err;
-
- num = udev_device_get_num_fake_partitions(dev);
- if (num > 0) {
- int i;
-
- info(udev, "removing all_partitions '%s[1-%i]'\n", devnode, num);
- if (num > 255)
- return -1;
- for (i = 1; i <= num; i++) {
- snprintf(partitionname, sizeof(partitionname), "%s%d", devnode, i);
- partitionname[sizeof(partitionname)-1] = '\0';
- if (!test)
- util_unlink_secure(udev, partitionname);
- }
+ if (stats.st_mode & 01000) {
+ info(udev, "device node '%s' has sticky bit set, skip removal\n", devnode);
+ goto out;
}
- util_delete_path(udev, devnode);
+
+ dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
+ if (dev_check != NULL) {
+ /* do not remove device node if the same sys-device is re-created in the meantime */
+ info(udev, "keeping device node of existing device'%s'\n", devnode);
+ udev_device_unref(dev_check);
+ goto out;
+ }
+
+ info(udev, "removing device node '%s'\n", devnode);
+ err = util_unlink_secure(udev, devnode);
+ if (err == 0)
+ util_delete_path(udev, devnode);
+
+ /* remove /dev/{block,char}/$major:$minor */
+ snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+ udev_get_dev_path(udev),
+ strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+ major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+ unlink(filename);
+out:
return err;
}
~ianmdlvl / elogind.git / blobdiff