From 22ed4a6d9aa67998eaa917ab6e9fd19b35bd4fd0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 2 Jun 2020 16:44:34 +0200
Subject: [PATCH] fs-util: add stat_warn_permissions() that operates on struct
 stat instead of fd

---
 src/basic/fs-util.c | 38 ++++++++++++++++++++++++--------------
 src/basic/fs-util.h |  1 +
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 7bbcb6051e..943bc56319 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -353,26 +353,36 @@ int fchmod_opath(int fd, mode_t m) {
         return 0;
 }
 
+int stat_warn_permissions(const char *path, const struct stat *st) {
+        assert(path);
+        assert(st);
+
+        /* Don't complain if we are reading something that is not a file, for example /dev/null */
+        if (!S_ISREG(st->st_mode))
+                return 0;
+
+        if (st->st_mode & 0111)
+                log_warning("Configuration file %s is marked executable. Please remove executable permission bits. Proceeding anyway.", path);
+
+        if (st->st_mode & 0002)
+                log_warning("Configuration file %s is marked world-writable. Please remove world writability permission bits. Proceeding anyway.", path);
+
+        if (getpid_cached() == 1 && (st->st_mode & 0044) != 0044)
+                log_warning("Configuration file %s is marked world-inaccessible. This has no effect as configuration data is accessible via APIs without restrictions. Proceeding anyway.", path);
+
+        return 0;
+}
+
 int fd_warn_permissions(const char *path, int fd) {
         struct stat st;
 
+        assert(path);
+        assert(fd >= 0);
+
         if (fstat(fd, &st) < 0)
                 return -errno;
 
-        /* Don't complain if we are reading something that is not a file, for example /dev/null */
-        if (!S_ISREG(st.st_mode))
-                return 0;
-
-        if (st.st_mode & 0111)
-                log_warning("Configuration file %s is marked executable. Please remove executable permission bits. Proceeding anyway.", path);
-
-        if (st.st_mode & 0002)
-                log_warning("Configuration file %s is marked world-writable. Please remove world writability permission bits. Proceeding anyway.", path);
-
-        if (getpid_cached() == 1 && (st.st_mode & 0044) != 0044)
-                log_warning("Configuration file %s is marked world-inaccessible. This has no effect as configuration data is accessible via APIs without restrictions. Proceeding anyway.", path);
-
-        return 0;
+        return stat_warn_permissions(path, &st);
 }
 
 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode) {
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index dd101c61cc..b184570f9f 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -40,6 +40,7 @@ int fchmod_umask(int fd, mode_t mode);
 int fchmod_opath(int fd, mode_t m);
 
 int fd_warn_permissions(const char *path, int fd);
+int stat_warn_permissions(const char *path, const struct stat *st);
 
 #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)