X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=d55700d70fe7df39aff8bf46da5b08b2b2e9ca93;hb=e85f5ec15f1c0a820cc81b422c2fa157d9805896;hp=4492c2e393d3ec904c12f9c70f86b0c9855a5038;hpb=1f084fe5811ce251d516a8022f8c7c27d0ef1f53;p=elogind.git

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 4492c2e39..d55700d70 100644
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -33,14 +33,13 @@
 
 #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;
@@ -164,7 +163,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *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",
@@ -323,7 +322,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
 			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
@@ -373,7 +372,7 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 	     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;
 	}
@@ -396,6 +395,8 @@ int udev_node_remove(struct udev_device *dev)
 	struct udev_list_entry *list_entry;
 	const char *devnode;
 	struct stat stats;
+	struct udev_device *dev_check;
+	char filename[UTIL_PATH_SIZE];
 	int err = 0;
 
 	/* remove/update symlinks, remove symlinks from name index */
@@ -404,32 +405,36 @@ int udev_node_remove(struct udev_device *dev)
 
 	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;
 	}
 
-	if (udev_device_get_ignore_remove(dev)) {
-		info(udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
-	} else {
-		struct udev_device *dev_check;
-
-		dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
-		if (dev_check != NULL && stats.st_rdev == udev_device_get_devnum(dev_check)) {
-			/* 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);
-		} else {
-			info(udev, "removing device node '%s'\n", devnode);
-			err = util_unlink_secure(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;
+	}
+
+	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)) {
+		info(udev, "static device entry found '%s', skip removal\n", devnode);
+		goto out;
 	}
 
+	info(udev, "removing device node '%s'\n", devnode);
+	err = util_unlink_secure(udev, devnode);
 	util_delete_path(udev, devnode);
+out:
 	return err;
 }