From: Taro Yamada <archer_ame@yahoo.co.jp>
Date: Tue, 22 Jan 2019 02:47:45 +0000 (+0900)
Subject: Fixes #11128
X-Git-Tag: v241-rc1~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bf05f0122f0f13cd0c0bc35a31861875d2ead31;p=thirdparty%2Fsystemd.git

Fixes #11128
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 07c5a72721b..092c80a6e7c 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2160,8 +2160,14 @@ static int setup_exec_directory(
                         r = mkdir_label(p, context->directories[type].mode);
                         if (r < 0 && r != -EEXIST)
                                 goto fail;
-                        if (r == -EEXIST && !context->dynamic_user)
-                                continue;
+                        if (r == -EEXIST) {
+                                if (chmod(p, context->directories[type].mode) < 0) {
+                                        r = -errno;
+                                        goto fail;
+                                }
+                                if (!context->dynamic_user)
+                                        continue;
+                        }
                 }
 
                 /* Don't change the owner of the configuration directory, as in the common case it is not written to by