From 915508d0d3989b8945a8dc54d585e4eb2aa0324a Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sun, 26 Oct 2014 12:38:38 -0400 Subject: src/shared/mkdir-label.c: move and rename mkdir_label() Signed-off-by: Anthony G. Basile --- src/shared/mkdir.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/shared/mkdir.c') diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c index 0c2a6cfe4d..3bc5131e40 100644 --- a/src/shared/mkdir.c +++ b/src/shared/mkdir.c @@ -23,13 +23,35 @@ #include #include #include -#include #include "label.h" #include "util.h" #include "path-util.h" #include "mkdir.h" +int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir) { + struct stat st; + + if (_mkdir(path, mode) >= 0) + if (chmod_and_chown(path, mode, uid, gid) < 0) + return -errno; + + if (lstat(path, &st) < 0) + return -errno; + + if ((st.st_mode & 0007) > (mode & 0007) || + (st.st_mode & 0070) > (mode & 0070) || + (st.st_mode & 0700) > (mode & 0700) || + (uid != (uid_t) -1 && st.st_uid != uid) || + (gid != (gid_t) -1 && st.st_gid != gid) || + !S_ISDIR(st.st_mode)) { + errno = EEXIST; + return -errno; + } + + return 0; +} + int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, mkdir_func_t _mkdir) { const char *p, *e; int r; -- cgit v1.2.3-54-g00ecf