selinux: more context settings

[elogind.git] / udev_utils_file.c

diff --git a/udev_utils_file.c b/udev_utils_file.c
index cd9c244f0f3d1b799f58063032ba2da959c6e3b5..9ab34705e2dd70c1d0becdc64c8db13439458273 100644 (file)
--- a/udev_utils_file.c
+++ b/udev_utils_file.c
@@ -1,6 +1,4 @@
 /*
- * udev_utils_file.c - files operations
- *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -30,37 +28,42 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.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)
+       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)
@@ -71,6 +74,9 @@ int delete_path(const char *path)
 
        strcpy (p, path);
        pos = strrchr(p, '/');
+       if (pos == p || pos == NULL)
+               return 0;
+
        while (1) {
                *pos = '\0';
                pos = strrchr(p, '/');