X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=c05c157575aa084716afab0f413c147f791bded3;hp=fe8f29b3a89007e20b595a73693644e4b18484ca;hb=4c514e31734a704ca58e543fa4330616ba584b39;hpb=4c21b7156d951c99fe8d57a36bf3b006cc3d3a73

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index fe8f29b3a..c05c15757 100644
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -43,18 +43,29 @@ int util_create_path(struct udev *udev, const char *path)
 	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);
 	err = mkdir(p, 0755);
-	if (err != 0 && errno == EEXIST)
-		if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-			err = 0;
+	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);
 	return err;
 }
@@ -103,8 +114,8 @@ int util_unlink_secure(struct udev *udev, const char *filename)
 {
 	int err;
 
-	chmod(filename, 0000);
 	chown(filename, 0, 0);
+	chmod(filename, 0000);
 	err = unlink(filename);
 	if (errno == ENOENT)
 		err = 0;
@@ -242,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};
@@ -250,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;
@@ -268,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++;
@@ -330,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 */