Merge pull request #26656 from yuwata/mkdir-error-code

mkdir: fix error code

2 files changed, 24 insertions, 1 deletions

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 7ad19ee33b..2257a1452f 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -32,11 +32,14 @@ int mkdirat_safe_internal(
         assert(mode != MODE_INVALID);
         assert(_mkdirat && _mkdirat != mkdirat);
 
-        if (_mkdirat(dir_fd, path, mode) >= 0) {
+        r = _mkdirat(dir_fd, path, mode);
+        if (r >= 0) {
                 r = chmod_and_chown_at(dir_fd, path, mode, uid, gid);
                 if (r < 0)
                         return r;
         }
+        if (r != -EEXIST)
+                return r;
 
         if (fstatat(dir_fd, path, &st, AT_SYMLINK_NOFOLLOW) < 0)
                 return -errno;
diff --git a/src/test/test-mkdir.c b/src/test/test-mkdir.c
index 2ea7257609..24933a3464 100644
--- a/src/test/test-mkdir.c
+++ b/src/test/test-mkdir.c
@@ -2,9 +2,11 @@
 
 #include <unistd.h>
 
+#include "capability-util.h"
 #include "fs-util.h"
 #include "mkdir.h"
 #include "path-util.h"
+#include "process-util.h"
 #include "rm-rf.h"
 #include "stat-util.h"
 #include "tests.h"
@@ -14,6 +16,7 @@
 TEST(mkdir_p_safe) {
         _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
         _cleanup_free_ char *p = NULL, *q = NULL;
+        int r;
 
         assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
 
@@ -35,6 +38,12 @@ TEST(mkdir_p_safe) {
         assert_se(is_dir(p, false) == 0);
         assert_se(is_dir(p, true) > 0);
 
+        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
+        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_IGNORE_EXISTING) >= 0);
+        assert_se(mkdir_safe(p, 0755, UID_INVALID, GID_INVALID, MKDIR_FOLLOW_SYMLINK) >= 0);
+        assert_se(is_dir(p, false) == 0);
+        assert_se(is_dir(p, true) > 0);
+
         p = mfree(p);
         assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
         assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
@@ -67,6 +76,17 @@ TEST(mkdir_p_safe) {
         assert_se(is_dir(q, true) > 0);
 
         assert_se(mkdir_p_safe(tmp, "/tmp/test-mkdir-outside", 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
+
+        p = mfree(p);
+        assert_se(p = path_join(tmp, "zero-mode/should-fail-to-create-child"));
+        assert_se(mkdir_parents_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0) >= 0);
+        r = safe_fork("(test-mkdir-no-cap)", FORK_DEATHSIG | FORK_WAIT | FORK_LOG, NULL);
+        if (r == 0) {
+                (void) capability_bounding_set_drop(0, /* right_now = */ true);
+                assert_se(mkdir_p_safe(tmp, p, 0000, UID_INVALID, GID_INVALID, 0) == -EACCES);
+                _exit(EXIT_SUCCESS);
+        }
+        assert_se(r >= 0);
 }
 
 TEST(mkdir_p_root) {