[PATCH] selinux: fix handling during creation of symlinks

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index d0d9eab913b21c4d00671e480d602dc1cadea0f6..9764cb9bcd6c07aabbe625ca07d8b6ebddde0d78 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -182,7 +182,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
                                snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
                                partitionname[sizeof(partitionname)-1] = '\0';
-                               part_devt = makedev(major(udev->devt), minor(udev->devt)+1);
+                               part_devt = makedev(major(udev->devt), minor(udev->devt) + i);
                                udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
                        }
                }
@@ -221,7 +221,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                dbg("symlink(%s, %s)", linktarget, filename);
                if (!udev->test_run) {
                        unlink(filename);
-                       selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
+                       selinux_setfscreatecon(filename, NULL, S_IFLNK);
                        retval = symlink(linktarget, filename);
                        selinux_resetfscreatecon();
                        if (retval != 0)
@@ -276,8 +276,11 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                }
        }
 
-       if (udev_rules_get_name(udev, class_dev) != 0)
+       udev_rules_get_name(udev, class_dev);
+       if (udev->ignore_device) {
+               dbg("device event will be ignored");
                return 0;
+       }
 
        dbg("adding name='%s'", udev->name);