X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_file.c;h=a492785af9ed656a350b209bc05ba1d02394cf0c;hp=e4d5802ff899824b6960a7369e150108c6d66dd9;hb=4c46d72a93409860aea84242f4dcbe37b2afab19;hpb=27d4bf1817259873b0a1e118d03978f0d2f2595e

diff --git a/udev_utils_file.c b/udev_utils_file.c
index e4d5802ff..a492785af 100644
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -29,32 +29,42 @@
 #include <sys/mman.h>
 
 #include "udev.h"
+#include "udev_selinux.h"
 
 int create_path(const char *path)
 {
 	char p[PATH_SIZE];
 	char *pos;
 	struct stat stats;
+	int ret;
 
-	strcpy (p, path);
+	strlcpy(p, path, sizeof(p));
 	pos = strrchr(p, '/');
 	if (pos == p || pos == NULL)
 		return 0;
 
 	while (pos[-1] == '/')
 		pos--;
-
 	pos[0] = '\0';
 
 	dbg("stat '%s'\n", p);
 	if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
 		return 0;
 
-	if (create_path (p) != 0)
+	if (create_path(p) != 0)
 		return -1;
 
 	dbg("mkdir '%s'\n", p);
-	return mkdir(p, 0755);
+ 	selinux_setfscreatecon(p, NULL, S_IFDIR|0755);
+	ret = mkdir(p, 0755);
+ 	selinux_resetfscreatecon();
+	if (ret == 0)
+		return 0;
+
+	if (errno == EEXIST)
+		if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
+			return 0;
+	return -1;
 }
 
 int delete_path(const char *path)
@@ -83,10 +93,10 @@ int delete_path(const char *path)
 		if (retval) {
 			if (errno == ENOTEMPTY)
 				return 0;
-			err("rmdir(%s) failed: %s", p, strerror(errno));
+			err("rmdir(%s) failed: %s\n", p, strerror(errno));
 			break;
 		}
-		dbg("removed '%s'", p);
+		dbg("removed '%s'\n", p);
 	}
 	return 0;
 }
@@ -100,18 +110,18 @@ int unlink_secure(const char *filename)
 
 	retval = chown(filename, 0, 0);
 	if (retval)
-		err("chown(%s, 0, 0) failed: %s", filename, strerror(errno));
+		err("chown(%s, 0, 0) failed: %s\n", filename, strerror(errno));
 
 	retval = chmod(filename, 0000);
 	if (retval)
-		err("chmod(%s, 0000) failed: %s", filename, strerror(errno));
+		err("chmod(%s, 0000) failed: %s\n", filename, strerror(errno));
 
 	retval = unlink(filename);
 	if (errno == ENOENT)
 		retval = 0;
 
 	if (retval)
-		err("unlink(%s) failed: %s", filename, strerror(errno));
+		err("unlink(%s) failed: %s\n", filename, strerror(errno));
 
 	return retval;
 }