From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 8 Dec 2018 19:21:43 +0000 (+0100)
Subject: mount-point: honour AT_SYMLINK_FOLLOW correctly
X-Git-Tag: v240~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be24321f3dae91a166166b239954032727439942;p=thirdparty%2Fsystemd.git

mount-point: honour AT_SYMLINK_FOLLOW correctly

Fixes: #11092
---

diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index 0a9f479e42a..1e946a0bb67 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -98,7 +98,7 @@ static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id
         if ((flags & AT_EMPTY_PATH) && isempty(filename))
                 xsprintf(path, "/proc/self/fdinfo/%i", fd);
         else {
-                subfd = openat(fd, filename, O_CLOEXEC|O_PATH);
+                subfd = openat(fd, filename, O_CLOEXEC|O_PATH|(flags & AT_SYMLINK_FOLLOW ? 0 : O_NOFOLLOW));
                 if (subfd < 0)
                         return -errno;