]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #33496 from YHNdnzj/fd-is-mount-symlink
authorLuca Boccassi <bluca@debian.org>
Tue, 2 Jul 2024 08:07:20 +0000 (10:07 +0200)
committerGitHub <noreply@github.com>
Tue, 2 Jul 2024 08:07:20 +0000 (10:07 +0200)
mountpoint-util: do not assume symlinks are not mountpoints

1  2 
src/basic/mountpoint-util.c

index 2b05abfbfe49895567e2bbfb53293c8af4dbe986,c3c245b259695627aec2351d82d0036af423322c..e8471d5974656a5264472d6f47c0c92424b5a094
@@@ -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;