X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=e1af3dbef61cf3a0d34a67af13e972eb31dd5c2a;hp=142503589a6f90a42f0da4cb392cba12f9f75525;hb=c1ab046124ebef3c82950b91ccfd1678d9f7fe5b;hpb=bce52be81ec679bf080bb11f292c899d9fde084e

diff --git a/udev_remove.c b/udev_remove.c
index 142503589..e1af3dbef 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -67,41 +67,6 @@ static int delete_path(const char *path)
 	return 0;
 }
 
-/** Remove all permissions on the device node, before
-  * unlinking it. This fixes a security issue.
-  * If the user created a hard-link to the device node,
-  * he can't use it any longer, because he lost permission
-  * to do so.
-  */
-static int secure_unlink(const char *filename)
-{
-	int retval;
-
-	retval = chown(filename, 0, 0);
-	if (retval) {
-		dbg("chown(%s, 0, 0) failed with error '%s'",
-		    filename, strerror(errno));
-		/* We continue nevertheless.
-		 * I think it's very unlikely for chown
-		 * to fail here, if the file exists.
-		 */
-	}
-	retval = chmod(filename, 0000);
-	if (retval) {
-		dbg("chmod(%s, 0000) failed with error '%s'",
-		    filename, strerror(errno));
-		/* We continue nevertheless. */
-	}
-	retval = unlink(filename);
-	if (errno == ENOENT)
-		retval = 0;
-	if (retval) {
-		dbg("unlink(%s) failed with error '%s'",
-			filename, strerror(errno));
-	}
-	return retval;
-}
-
 static int delete_node(struct udevice *udev)
 {
 	char filename[NAME_SIZE];
@@ -116,7 +81,7 @@ static int delete_node(struct udevice *udev)
 	filename[NAME_SIZE-1] = '\0';
 
 	info("removing device node '%s'", filename);
-	retval = secure_unlink(filename);
+	retval = unlink_secure(filename);
 	if (retval)
 		return retval;
 
@@ -131,7 +96,7 @@ static int delete_node(struct udevice *udev)
 		for (i = 1; i <= num; i++) {
 			strfieldcpy(partitionname, filename);
 			strintcat(partitionname, i);
-			secure_unlink(partitionname);
+			unlink_secure(partitionname);
 		}
 	}