#define TMP_FILE_EXT ".udev-tmp"
-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);
+ dev_t devnum = udev_device_get_devnum(dev);
struct stat stats;
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;
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",
err = util_create_path(udev, filename);
if (err != 0 && err != -ENOENT)
break;
- fd = open(filename, O_WRONLY|O_CREAT, 0444);
+ fd = open(filename, O_WRONLY|O_CREAT|O_NOFOLLOW, 0444);
if (fd >= 0)
close(fd);
else
major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
mode, uid, gid);
- if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
+ if (udev_node_mknod(dev, NULL, mode, uid, gid) != 0) {
err = -1;
goto exit;
}
}
util_strscpyl(filename, sizeof(filename), LIBEXECDIR "/devices", &devnode[strlen(udev_get_dev_path(udev))], NULL);
- if (stat(filename, &stats) == 0 || stats.st_rdev == udev_device_get_devnum(dev)) {
+ if (stat(filename, &stats) == 0 && stats.st_rdev == udev_device_get_devnum(dev)) {
info(udev, "static device entry found '%s', skip removal\n", devnode);
goto out;
}