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 3685485eb1066a113226733e366aa5eeb0160f3c..8c2154d37e4b6d35d0c00eac6764d8d363691ab2 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -77,10 +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));
-               util_create_path(udev, file);
-               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;
@@ -175,10 +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);
-               util_create_path(udev, slink);
-               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;
        }
@@ -186,10 +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);
-       util_create_path(udev, slink);
-       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;
@@ -301,9 +319,17 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
        }
 
        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);
        }
 }