[PATCH] switch major/minor to dev_t

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index 172ec12690ac993f339444a1c711e8c8986213f3..3a3db737c186bd7763f92bd8399cdfc8305e0b22 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -71,6 +71,7 @@ static int delete_node(struct udevice *udev)
 {
        char filename[NAME_SIZE];
        char partitionname[NAME_SIZE];
 {
        char filename[NAME_SIZE];
        char partitionname[NAME_SIZE];

+       struct stat stats;

        int retval;
        int i;
        char *pos;
        int retval;
        int i;
        char *pos;


@@ -80,6 +81,15 @@ static int delete_node(struct udevice *udev)
        snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
        filename[NAME_SIZE-1] = '\0';
 
        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 = unlink_secure(filename);
        if (retval)
        info("removing device node '%s'", filename);
        retval = unlink_secure(filename);
        if (retval)