From 15e2182fb32a652a6f22d50b14bba4b1976dea8a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Aug 2022 14:49:17 +0200
Subject: [PATCH] mkdir: don't allow us to get confused by symlinks in
 mkdir_p_root()'s chowning logic

---
 src/basic/mkdir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 8e4849b7926..cd966cba942 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -233,7 +233,7 @@ int mkdir_p_root(const char *root, const char *p, uid_t uid, gid_t gid, mode_t m
         if (uid_is_valid(uid) || gid_is_valid(gid)) {
                 _cleanup_close_ int nfd = -1;
 
-                nfd = openat(dfd, bn, O_RDONLY|O_CLOEXEC|O_DIRECTORY);
+                nfd = openat(dfd, bn, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOFOLLOW);
                 if (nfd < 0)
                         return -errno;
 
-- 
2.47.3