[PATCH] switch major/minor to dev_t

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index 56834a45b929eaa1127944a9383d12baa8d4dfc4..3a3db737c186bd7763f92bd8399cdfc8305e0b22 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -31,11 +31,11 @@
 #include <sys/stat.h>
 
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
+#include "logging.h"
 
 static int delete_path(const char *path)
 {
@@ -67,45 +67,11 @@ 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];
        char partitionname[NAME_SIZE];
+       struct stat stats;
        int retval;
        int i;
        char *pos;
@@ -115,8 +81,17 @@ static int delete_node(struct udevice *udev)
        snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
        filename[NAME_SIZE-1] = '\0';
 
+       dbg("checking major/minor of device node '%s'", filename);
+       if (stat(filename, &stats) != 0)
+               return -1;
+
+       if (udev->devt && stats.st_rdev != udev->devt) {
+               info("device node '%s' points to a different device, skip removal", filename);
+               return -1;
+       }
+
        info("removing device node '%s'", filename);
-       retval = secure_unlink(filename);
+       retval = unlink_secure(filename);
        if (retval)
                return retval;
 
@@ -124,14 +99,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);
                }
        }
 
@@ -175,7 +150,7 @@ int udev_remove_device(struct udevice *udev)
        if (udev->type != 'b' && udev->type != 'c')
                return 0;
 
-       retval = udevdb_get_dev(udev);
+       retval = udev_db_get_device(udev);
        if (retval) {
                /* fall back to kernel name */
                temp = strrchr(udev->devpath, '/');
@@ -185,8 +160,13 @@ int udev_remove_device(struct udevice *udev)
                dbg("'%s' not found in database, falling back on default name", udev->name);
        }
 
+       if (udev->ignore_remove) {
+               dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+               return 0;
+       }
+
        dbg("remove name='%s'", udev->name);
-       udevdb_delete_dev(udev);
+       udev_db_delete_device(udev);
 
        /* use full path to the environment */
        snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);