selinux: more context settings

[elogind.git] / udev_utils_file.c

diff --git a/udev_utils_file.c b/udev_utils_file.c
index e4d5802ff899824b6960a7369e150108c6d66dd9..9ab34705e2dd70c1d0becdc64c8db13439458273 100644 (file)
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -35,26 +35,35 @@ 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);
+       dbg("stat '%s'", 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);
+       dbg("mkdir '%s'", p);
+       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)