X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_node.c;h=25eed86935978af1d6e9141eacdd50edf3ea6eb3;hb=89e0a02226cbadf6a58c4d234e31c7111eed20bc;hp=8c0287405c537505bc80a32423c44090fabcffc4;hpb=e54f0b4ad2f10ecfefe01d607c43f086e9e889fe;p=elogind.git

diff --git a/udev_node.c b/udev_node.c
index 8c0287405..25eed8693 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -46,24 +46,24 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m
 	else
 		mode |= S_IFCHR;
 
-	/* preserve node with already correct numbers, to prevent changing the inode number */
 	if (lstat(file, &stats) == 0) {
 		if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
 			info("preserve file '%s', because it has correct dev_t", file);
 			selinux_setfilecon(file, udev->dev->kernel, stats.st_mode);
 			goto perms;
 		}
+	} else {
+		selinux_setfscreatecon(file, udev->dev->kernel, mode);
+		retval = mknod(file, mode, devt);
+		selinux_resetfscreatecon();
+		if (retval == 0)
+			goto perms;
 	}
 
-	selinux_setfscreatecon(file, udev->dev->kernel, mode);
-	retval = mknod(file, mode, devt);
-	selinux_resetfscreatecon();
-	if (retval == 0)
-		goto perms;
-
 	info("atomically replace '%s'", file);
 	strlcpy(file_tmp, file, sizeof(file_tmp));
 	strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp));
+	unlink(file_tmp);
 	selinux_setfscreatecon(file_tmp, udev->dev->kernel, mode);
 	retval = mknod(file_tmp, mode, devt);
 	selinux_resetfscreatecon();
@@ -133,7 +133,7 @@ static int node_symlink(const char *node, const char *slink)
 				    stats.st_rdev == stats2.st_rdev) {
 					info("replace device node '%s' with symlink to our node '%s'", slink, node);
 				} else {
-					err("device node '%s' already exists, link '%s' will not overwrite it", node, slink);
+					err("device node '%s' already exists, link to '%s' will not overwrite it", slink, node);
 					goto exit;
 				}
 			}
@@ -151,18 +151,19 @@ static int node_symlink(const char *node, const char *slink)
 				}
 			}
 		}
+	} else {
+		info("creating symlink '%s' to '%s'", slink, target);
+		selinux_setfscreatecon(slink, NULL, S_IFLNK);
+		retval = symlink(target, slink);
+		selinux_resetfscreatecon();
+		if (retval == 0)
+			goto exit;
 	}
 
-	info("creating symlink '%s' to '%s'", slink, target);
-	selinux_setfscreatecon(slink, NULL, S_IFLNK);
-	retval = symlink(target, slink);
-	selinux_resetfscreatecon();
-	if (retval == 0)
-		goto exit;
-
 	info("atomically replace '%s'", slink);
 	strlcpy(slink_tmp, slink, sizeof(slink_tmp));
 	strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
+	unlink(slink_tmp);
 	selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK);
 	retval = symlink(target, slink_tmp);
 	selinux_resetfscreatecon();