X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=71488c93ad00f4ffd7303f583f804c153e568600;hb=b3e44c5291f60c0d70af941514ab58c8d31f14a7;hp=aaa2e32e65e079a215d818f050cd976be28aff4c;hpb=5f59fa0900a5c127ce1a25d8ba3176f166662f96;p=elogind.git

diff --git a/udev/udev-node.c b/udev/udev-node.c
index aaa2e32e6..71488c93a 100644
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -52,7 +52,9 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
 	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);
-			if (stats.st_mode != mode || stats.st_uid != uid || stats.st_gid != gid) {
+			if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) {
+				/* preserve 'sticky' bit, if already set */
+				mode |= stats.st_mode & 01000;
 				info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
 				chmod(file, mode);
 				chown(file, uid, gid);
@@ -96,7 +98,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
 	} else {
 		info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode);
 		do {
-			err = util_create_path(udev, file);
+			err = util_create_path_selinux(udev, file);
 			if (err != 0 && err != -ENOENT)
 				break;
 			udev_selinux_setfscreatecon(udev, file, mode);
@@ -184,7 +186,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
 	} else {
 		info(udev, "creating symlink '%s' to '%s'\n", slink, target);
 		do {
-			err = util_create_path(udev, slink);
+			err = util_create_path_selinux(udev, slink);
 			if (err != 0 && err != -ENOENT)
 				break;
 			udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
@@ -201,7 +203,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(udev, slink_tmp);
+		err = util_create_path_selinux(udev, slink_tmp);
 		if (err != 0 && err != -ENOENT)
 			break;
 		udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
@@ -292,7 +294,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
 	dbg(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
 
 	util_path_encode(&slink[strlen(udev_get_dev_path(udev))+1], name_enc, sizeof(name_enc));
-	util_strscpyl(dirname, sizeof(dirname), udev_get_dev_path(udev), "/.run/udev/links/", name_enc, NULL);
+	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);
 
 	if (!add) {
@@ -386,7 +388,7 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 
 	/* 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))
+		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
@@ -425,6 +427,11 @@ int udev_node_remove(struct udev_device *dev)
 		goto out;
 	}
 
+	if (stats.st_mode & 01000) {
+		info(udev, "device node '%s' has sticky bit set, skip removal\n", devnode);
+		goto out;
+	}
+
 	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 */