break loops if util_create_path() returns error

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

diff --git a/udev/udev-node.c b/udev/udev-node.c
index f17c48a7b410dc72fdb6bd67144c1b3dc0ed3e9a..8c2154d37e4b6d35d0c00eac6764d8d363691ab2 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -77,9 +77,16 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
                }
        } else {
                info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
-               udev_selinux_setfscreatecon(udev, file, mode);
-               err = mknod(file, mode, devnum);
-               udev_selinux_resetfscreatecon(udev);
+               do {
+                       err = util_create_path(udev, file);
+                       if (err != 0 && err != -ENOENT)
+                               break;
+                       udev_selinux_setfscreatecon(udev, file, mode);
+                       err = mknod(file, mode, devnum);
+                       if (err != 0)
+                               err = -errno;
+                       udev_selinux_resetfscreatecon(udev);
+               } while (err == -ENOENT);
                if (err != 0) {
                        err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
                        goto exit;
@@ -174,9 +181,16 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                }
        } else {
                info(udev, "creating symlink '%s' to '%s'\n", slink, target);
-               udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
-               err = symlink(target, slink);
-               udev_selinux_resetfscreatecon(udev);
+               do {
+                       err = util_create_path(udev, slink);
+                       if (err != 0 && err != -ENOENT)
+                               break;
+                       udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+                       err = symlink(target, slink);
+                       if (err != 0)
+                               err = -errno;
+                       udev_selinux_resetfscreatecon(udev);
+               } while (err == -ENOENT);
                if (err == 0)
                        goto exit;
        }
@@ -184,9 +198,16 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
        info(udev, "atomically replace '%s'\n", slink);
        util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
        unlink(slink_tmp);
-       udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
-       err = symlink(target, slink_tmp);
-       udev_selinux_resetfscreatecon(udev);
+       do {
+               err = util_create_path(udev, slink_tmp);
+               if (err != 0 && err != -ENOENT)
+                       break;
+               udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
+               err = symlink(target, slink_tmp);
+               if (err != 0)
+                       err = -errno;
+               udev_selinux_resetfscreatecon(udev);
+       } while (err == -ENOENT);
        if (err != 0) {
                err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
                goto exit;
@@ -293,15 +314,22 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
                unlink(slink);
                util_delete_path(udev, slink);
        } else {
-               util_create_path(udev, slink);
                info(udev, "creating link '%s' to '%s'\n", slink, target);
                node_symlink(udev, target, slink);
        }
 
        if (add) {
+               int err;
+
                dbg(udev, "creating index: '%s'\n", filename);
-               util_create_path(udev, filename);
-               symlink(udev_device_get_devpath(dev), filename);
+               do {
+                       err = util_create_path(udev, filename);
+                       if (err != 0 && err != -ENOENT)
+                               break;
+                       err = symlink(udev_device_get_devpath(dev), filename);
+                       if (err != 0)
+                               err = -errno;
+               } while (err == -ENOENT);
        }
 }
 
@@ -348,7 +376,6 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
             major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
             mode, uid, gid);
 
-       util_create_path(udev, udev_device_get_devnode(dev));
        if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
                err = -1;
                goto exit;
@@ -373,13 +400,11 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 
        /* 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_flag(list_entry)) {
+               if (udev_list_entry_get_flag(list_entry))
                        /* simple unmanaged link name */
-                       util_create_path(udev, udev_list_entry_get_name(list_entry));
                        node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry));
-               } else {
+               else
                        link_update(dev, udev_list_entry_get_name(list_entry), 1);
-               }
        }
 exit:
        return err;