X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-node.c;h=44d3686db61a75f37d6994c2f98377644b5db039;hb=c2e63452dda721bb7f127adefdfe444153a9bdca;hp=dc7d9c365a64efaa6b53eff9b75d8b0077104f07;hpb=cbfad6af1fdc73c6f3c6b001047ff4a86c8a6efd;p=elogind.git

diff --git a/udev/udev-node.c b/udev/udev-node.c
index dc7d9c365..44d3686db 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);
@@ -105,7 +107,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
 				err = -errno;
 			udev_selinux_resetfscreatecon(udev);
 		} while (err == -ENOENT);
-		if (err != 0)
+		if (err != 0 && err != -EEXIST)
 			err(udev, "mknod '%s' %u:%u %#o' failed: %m\n", file, major(devnum), minor(devnum), mode);
 		info(udev, "set permissions '%s' %#o uid=%u gid=%u\n", file, mode, uid, gid);
 		chmod(file, mode);
@@ -414,15 +416,19 @@ int udev_node_remove(struct udev_device *dev)
 	if (devnode == NULL)
 		goto out;
 
-	if (stat(devnode, &stats) != 0) {
-		info(udev, "device node '%s' not found\n", devnode);
-		goto out;
-	}
+	if (stat(devnode, &stats) == 0) {
+		if (stats.st_rdev != udev_device_get_devnum(dev)) {
+			info(udev, "device node '%s' points to a different device, skip removal\n", devnode);
+			err = -1;
+			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);
-		err = -1;
-		goto out;
+		if (stats.st_mode & 01000) {
+			info(udev, "device node '%s' has sticky bit set, skip removal\n", devnode);
+			goto out;
+		}
+	} else {
+		info(udev, "device node '%s' not found\n", devnode);
 	}
 
 	dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));