keymap: Fix struck Touchpad key on Dell Latitude E series

[elogind.git] / udev / udev-node.c

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 8339eb732f0bd8b42e9a57be8aed5d5a823c9a26..c8113f10b094988b8769a3d6ce32b6d6d6a7c8e7 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -56,10 +56,17 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
                                info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
                                chmod(file, mode);
                                chown(file, uid, gid);
-                               udev_selinux_lsetfilecon(udev, file, mode);
                        } else {
                                info(udev, "preserve permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid);
                        }
+                       /*
+                        * Set initial selinux file context only on add events.
+                        * We set the proper context on bootup (triger) or for newly
+                        * added devices, but we don't change it later, in case
+                        * something else has set a custom context in the meantime.
+                        */
+                       if (strcmp(udev_device_get_action(dev), "add") == 0)
+                               udev_selinux_lsetfilecon(udev, file, mode);
                        /* always update timestamp when we re-use the node, like on media change events */
                        utimensat(AT_FDCWD, file, NULL, 0);
                } else {
@@ -298,15 +305,15 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
 
        if (!add) {
                dbg(udev, "removing index: '%s'\n", filename);
-               unlink(filename);
-               util_delete_path(udev, filename);
+               if (unlink(filename) == 0)
+                       rmdir(dirname);
        }
 
        target = link_find_prioritized(dev, add, dirname, buf, sizeof(buf));
        if (target == NULL) {
                info(udev, "no reference left, remove '%s'\n", slink);
-               unlink(slink);
-               util_delete_path(udev, slink);
+               if (unlink(slink) == 0)
+                       util_delete_path(udev, slink);
        } else {
                info(udev, "creating link '%s' to '%s'\n", slink, target);
                node_symlink(udev, target, slink);
@@ -427,7 +434,8 @@ int udev_node_remove(struct udev_device *dev)
 
        info(udev, "removing device node '%s'\n", devnode);
        err = util_unlink_secure(udev, devnode);
-       util_delete_path(udev, devnode);
+       if (err == 0)
+               util_delete_path(udev, devnode);
 out:
        return err;
 }