X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=a9ffa988b14f0f3d66645b12d949c8e1d42979ee;hb=24d1076696ebe6696a8b8df414ab265aa6fc89c2;hp=92634427f95ecceca96e9f27f4422164cf7b3a9c;hpb=4281da1fa6fda10c15bee984825fc607a8385004;p=elogind.git

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 92634427f..a9ffa988b 100644
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -327,7 +327,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|O_NOFOLLOW, 0444);
+			fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
 			if (fd >= 0)
 				close(fd);
 			else
@@ -369,6 +369,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 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);
+	char filename[UTIL_PATH_SIZE];
 	struct udev_list_entry *list_entry;
 	int err = 0;
 
@@ -382,6 +383,13 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 		goto exit;
 	}
 
+	/* 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)) {
 		if (udev_list_entry_get_flags(list_entry))
@@ -401,6 +409,7 @@ int udev_node_remove(struct udev_device *dev)
 	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 */
@@ -434,6 +443,13 @@ int udev_node_remove(struct udev_device *dev)
 	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;
 }