[PATCH] libsysfs: work around a klibc bug

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index 142503589a6f90a42f0da4cb392cba12f9f75525..172ec12690ac993f339444a1c711e8c8986213f3 100644 (file)
--- 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;
 
@@ -124,14 +89,14 @@ static int delete_node(struct udevice *udev)
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
-               if (num > PARTITIONS_COUNT) {
+               if (num > 255) {
                        info("garbage from udev database, skip all_partitions removal");
                        return -1;
                }
                for (i = 1; i <= num; i++) {
                        strfieldcpy(partitionname, filename);
                        strintcat(partitionname, i);
-                       secure_unlink(partitionname);
+                       unlink_secure(partitionname);
                }
        }