summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-04-01 20:13:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-04-01 22:07:41 +0200
commitb6cceaae300467af6946534cf745bb549da1050f (patch)
tree97fd099f0e3342e8aba44b9c53b3216e5ad8f8ea
parentc0b471e1970fa6ae523c65aba5c2414a327c3d95 (diff)
downloadsystemd-b6cceaae300467af6946534cf745bb549da1050f.tar.gz
fs-util: suppress world-writable warnings if we read /dev/null
Fixes: #12165
-rw-r--r--src/basic/fs-util.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index ce1f5454c8..9f3fd45691 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -353,6 +353,10 @@ int fd_warn_permissions(const char *path, int fd) {
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);