From: Luca Boccassi <bluca@debian.org>
Date: Tue, 2 Jul 2024 08:07:20 +0000 (+0200)
Subject: Merge pull request #33496 from YHNdnzj/fd-is-mount-symlink
X-Git-Tag: v257-rc1~998
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dfce2296c3e84ebbd79d4e39c7cf216a02d1001;p=thirdparty%2Fsystemd.git

Merge pull request #33496 from YHNdnzj/fd-is-mount-symlink

mountpoint-util: do not assume symlinks are not mountpoints
---

5dfce2296c3e84ebbd79d4e39c7cf216a02d1001
diff --cc src/basic/mountpoint-util.c
index 2b05abfbfe4,c3c245b2596..e8471d59746
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@@ -273,10 -231,8 +273,8 @@@ int fd_is_mount_point(int fd, const cha
                  /* If statx() is not available or forbidden, fall back to name_to_handle_at() below */
          } else if (FLAGS_SET(sx.stx_attributes_mask, STATX_ATTR_MOUNT_ROOT)) /* yay! */
                  return FLAGS_SET(sx.stx_attributes, STATX_ATTR_MOUNT_ROOT);
-         else if (FLAGS_SET(sx.stx_mask, STATX_TYPE) && S_ISLNK(sx.stx_mode))
-                 return false; /* symlinks are never mount points */
  
 -        r = name_to_handle_at_loop(fd, filename, &h, &mount_id, flags);
 +        r = name_to_handle_at_try_fid(fd, filename, &h, &mount_id, flags);
          if (r < 0) {
                  if (is_name_to_handle_at_fatal_error(r))
                          return r;