udevd: clarify worker exit status

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

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 228b3ebee4d43f9fe4ed2be39bb7a3b3197b95ee..5e791ffb6c50753783018240f6d13866f845868d 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);
                                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);
                        }
                        } 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 {
                        /* always update timestamp when we re-use the node, like on media change events */
                        utimensat(AT_FDCWD, file, NULL, 0);
                } else {


@@ -89,7 +96,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_
        } else {
                info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode);
                do {
        } else {
                info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode);
                do {

-                       err = util_create_path(udev, file);
+                       err = util_create_path_selinux(udev, file);

                        if (err != 0 && err != -ENOENT)
                                break;
                        udev_selinux_setfscreatecon(udev, file, mode);
                        if (err != 0 && err != -ENOENT)
                                break;
                        udev_selinux_setfscreatecon(udev, file, mode);


@@ -177,7 +184,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
        } else {
                info(udev, "creating symlink '%s' to '%s'\n", slink, target);
                do {
        } else {
                info(udev, "creating symlink '%s' to '%s'\n", slink, target);
                do {

-                       err = util_create_path(udev, slink);
+                       err = util_create_path_selinux(udev, slink);

                        if (err != 0 && err != -ENOENT)
                                break;
                        udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
                        if (err != 0 && err != -ENOENT)
                                break;
                        udev_selinux_setfscreatecon(udev, slink, S_IFLNK);


@@ -194,7 +201,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
        util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
        unlink(slink_tmp);
        do {
        util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
        unlink(slink_tmp);
        do {

-               err = util_create_path(udev, slink_tmp);
+               err = util_create_path_selinux(udev, slink_tmp);

                if (err != 0 && err != -ENOENT)
                        break;
                udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
                if (err != 0 && err != -ENOENT)
                        break;
                udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);


@@ -236,26 +243,20 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
        for (;;) {
                struct udev_device *dev_db;
                struct dirent *dent;
        for (;;) {
                struct udev_device *dev_db;
                struct dirent *dent;

-               int maj, min;
-               char type, type2;
-               dev_t devnum;

 
                dent = readdir(dir);
                if (dent == NULL || dent->d_name[0] == '\0')
                        break;
                if (dent->d_name[0] == '.')
                        continue;
 
                dent = readdir(dir);
                if (dent == NULL || dent->d_name[0] == '\0')
                        break;
                if (dent->d_name[0] == '.')
                        continue;

-               if (sscanf(dent->d_name, "%c%i:%i", &type, &maj, &min) != 3)
-                       continue;
-               info(udev, "found '%c%i:%i' claiming '%s'\n", type, maj, min, stackdir);
-               devnum = makedev(maj, min);
+
+               info(udev, "found '%s' claiming '%s'\n", dent->d_name, stackdir);

 
                /* did we find ourself? */
 
                /* did we find ourself? */

-               type2 = strcmp(udev_device_get_subsystem(dev), "block") == 0 ? 'b' : 'c';
-               if (udev_device_get_devnum(dev) == devnum && type == type2)
+               if (strcmp(dent->d_name, udev_device_get_id_filename(dev)) == 0)

                        continue;
 
                        continue;
 

-               dev_db = udev_device_new_from_devnum(udev, type, devnum);
+               dev_db = udev_device_new_from_id_filename(udev, dent->d_name);

                if (dev_db != NULL) {
                        const char *devnode;
 
                if (dev_db != NULL) {
                        const char *devnode;
 


@@ -291,10 +292,8 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
        dbg(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
 
        util_path_encode(&slink[strlen(udev_get_dev_path(udev))+1], name_enc, sizeof(name_enc));
        dbg(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
 
        util_path_encode(&slink[strlen(udev_get_dev_path(udev))+1], name_enc, sizeof(name_enc));

-       snprintf(dirname, sizeof(dirname), "%s/.udev/links/%s", udev_get_dev_path(udev), name_enc);
-       snprintf(filename, sizeof(filename), "%s/%c%u:%u", dirname,
-                strcmp(udev_device_get_subsystem(dev), "block") == 0 ? 'b' : 'c',
-                major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+       util_strscpyl(dirname, sizeof(dirname), udev_get_run_path(udev), "/links/", name_enc, NULL);
+       util_strscpyl(filename, sizeof(filename), dirname, "/", udev_device_get_id_filename(dev), NULL);

 
        if (!add) {
                dbg(udev, "removing index: '%s'\n", filename);
 
        if (!add) {
                dbg(udev, "removing index: '%s'\n", filename);


@@ -322,7 +321,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
                        err = util_create_path(udev, filename);
                        if (err != 0 && err != -ENOENT)
                                break;
                        err = util_create_path(udev, filename);
                        if (err != 0 && err != -ENOENT)
                                break;

-                       fd = open(filename, O_WRONLY|O_CREAT|O_NOFOLLOW, 0444);
+                       fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);

                        if (fd >= 0)
                                close(fd);
                        else
                        if (fd >= 0)
                                close(fd);
                        else


@@ -364,6 +363,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 {
        struct udev *udev = udev_device_get_udev(dev);
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 {
        struct udev *udev = udev_device_get_udev(dev);

+       char filename[UTIL_PATH_SIZE];

        struct udev_list_entry *list_entry;
        int err = 0;
 
        struct udev_list_entry *list_entry;
        int err = 0;
 


@@ -377,6 +377,13 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
                goto exit;
        }
 
                goto exit;
        }
 

+       /* always add /dev/{block,char}/$major:$minor */
+       snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+                udev_get_dev_path(udev),
+                strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+       node_symlink(udev, udev_device_get_devnode(dev), filename);
+

        /* create/update symlinks, add symlinks to name index */
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
                if (udev_list_entry_get_flags(list_entry))
        /* create/update symlinks, add symlinks to name index */
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
                if (udev_list_entry_get_flags(list_entry))


@@ -396,6 +403,7 @@ int udev_node_remove(struct udev_device *dev)
        const char *devnode;
        struct stat stats;
        struct udev_device *dev_check;
        const char *devnode;
        struct stat stats;
        struct udev_device *dev_check;

+       char filename[UTIL_PATH_SIZE];

        int err = 0;
 
        /* remove/update symlinks, remove symlinks from name index */
        int err = 0;
 
        /* remove/update symlinks, remove symlinks from name index */


@@ -429,6 +437,13 @@ int udev_node_remove(struct udev_device *dev)
        err = util_unlink_secure(udev, devnode);
        if (err == 0)
                util_delete_path(udev, devnode);
        err = util_unlink_secure(udev, devnode);
        if (err == 0)
                util_delete_path(udev, devnode);

+
+       /* remove /dev/{block,char}/$major:$minor */
+       snprintf(filename, sizeof(filename), "%s/%s/%u:%u",
+                udev_get_dev_path(udev),
+                strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
+                major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
+       unlink(filename);

 out:
        return err;
 }
 out:
        return err;
 }