util_unlink_secure(): chmod() before chown()

[elogind.git] / libudev / libudev-util-private.c

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 84dee559c40cafdb4c345786c8d6d61dee88a4fc..c05c157575aa084716afab0f413c147f791bded3 100644 (file)
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -30,35 +30,44 @@ int util_create_path(struct udev *udev, const char *path)
        char p[UTIL_PATH_SIZE];
        char *pos;
        struct stat stats;
-       int ret;
+       int err;
 
        util_strscpy(p, sizeof(p), path);
        pos = strrchr(p, '/');
-       if (pos == p || pos == NULL)
+       if (pos == NULL)
                return 0;
-
-       while (pos[-1] == '/')
+       while (pos != p && pos[-1] == '/')
                pos--;
+       if (pos == p)
+               return 0;
        pos[0] = '\0';
 
        dbg(udev, "stat '%s'\n", p);
-       if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-               return 0;
+       if (stat(p, &stats) == 0) {
+               if ((stats.st_mode & S_IFMT) == S_IFDIR)
+                       return 0;
+               else
+                       return -ENOTDIR;
+       }
 
-       if (util_create_path(udev, p) != 0)
-               return -1;
+       err = util_create_path(udev, p);
+       if (err != 0)
+               return err;
 
        dbg(udev, "mkdir '%s'\n", p);
        udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
-       ret = mkdir(p, 0755);
+       err = mkdir(p, 0755);
+       if (err != 0) {
+               err = -errno;
+               if (err == -EEXIST && stat(p, &stats) == 0) {
+                       if ((stats.st_mode & S_IFMT) == S_IFDIR)
+                               err = 0;
+                       else
+                               err = -ENOTDIR;
+               }
+       }
        udev_selinux_resetfscreatecon(udev);
-       if (ret == 0)
-               return 0;
-
-       if (errno == EEXIST)
-               if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-                       return 0;
-       return -1;
+       return err;
 }
 
 int util_delete_path(struct udev *udev, const char *path)
@@ -67,7 +76,10 @@ int util_delete_path(struct udev *udev, const char *path)
        char *pos;
        int retval;
 
-       strcpy (p, path);
+       if (path[0] == '/')
+               while(path[1] == '/')
+                       path++;
+       util_strscpy(p, sizeof(p), path);
        pos = strrchr(p, '/');
        if (pos == p || pos == NULL)
                return 0;
@@ -100,24 +112,16 @@ int util_delete_path(struct udev *udev, const char *path)
  */
 int util_unlink_secure(struct udev *udev, const char *filename)
 {
-       int retval;
-
-       retval = chown(filename, 0, 0);
-       if (retval)
-               err(udev, "chown(%s, 0, 0) failed: %m\n", filename);
-
-       retval = chmod(filename, 0000);
-       if (retval)
-               err(udev, "chmod(%s, 0000) failed: %m\n", filename);
+       int err;
 
-       retval = unlink(filename);
+       chown(filename, 0, 0);
+       chmod(filename, 0000);
+       err = unlink(filename);
        if (errno == ENOENT)
-               retval = 0;
-
-       if (retval)
+               err = 0;
+       if (err)
                err(udev, "unlink(%s) failed: %m\n", filename);
-
-       return retval;
+       return err;
 }
 
 uid_t util_lookup_user(struct udev *udev, const char *user)
@@ -162,9 +166,12 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
        buf = NULL;
        gid = 0;
        for (;;) {
-               buf = realloc(buf, buflen);
-               if (!buf)
+               char *newbuf;
+
+               newbuf = realloc(buf, buflen);
+               if (!newbuf)
                        break;
+               buf = newbuf;
                errno = getgrnam_r(group, &grbuf, buf, buflen, &gr);
                if (gr != NULL) {
                        gid = gr->gr_gid;
@@ -246,7 +253,8 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 }
 
 int util_run_program(struct udev *udev, const char *command, char **envp,
-                    char *result, size_t ressize, size_t *reslen)
+                    char *result, size_t ressize, size_t *reslen,
+                    const sigset_t *sigmask)
 {
        int status;
        int outpipe[2] = {-1, -1};
@@ -254,7 +262,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
        pid_t pid;
        char arg[UTIL_PATH_SIZE];
        char program[UTIL_PATH_SIZE];
-       char *argv[(sizeof(arg) / 2) + 1];
+       char *argv[((sizeof(arg) + 1) / 2) + 1];
        int devnull;
        int i;
        int err = 0;
@@ -272,10 +280,14 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                                /* do not separate quotes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");
-                               while (pos != NULL && pos[0] == ' ')
-                                       pos++;
+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;
                        } else {
                                argv[i] = strsep(&pos, " ");
+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;
                        }
                        dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
                        i++;
@@ -334,6 +346,10 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                        dup2(errpipe[WRITE_END], STDERR_FILENO);
                        close(errpipe[WRITE_END]);
                }
+
+               if (sigmask)
+                       sigprocmask(SIG_SETMASK, sigmask, NULL);
+
                execve(argv[0], argv, envp);
                if (errno == ENOENT || errno == ENOTDIR) {
                        /* may be on a filesystem which is not mounted right now */