path-util: fix breakage in path_is_mount_point

This fixes 2 problems introduced by 6feeeab0bc:

1) If name_to_handle_at returns ENOSYS for the child, we'll wrongly
return -ENOSYS when it returns the same for the parent. Immediately
jump to the fallback logic when we get ENOSYS.

2) If name_to_handle_at returns EOPNOTSUPP for the child but suceeds
for the parent, we'll be comparing an uninitialized value (mount_id) to
an initialized value (mount_id_parent). Initialize the mount_id
variables to invalid mount_ids to avoid this.

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 8c43d060fb2ed93f1eb008f4c56cb63cfe3352a9..ad9dc882b2ac1ef6c69ed2d4529589fcaaafab3d 100644 (file)
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -458,7 +458,7 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
                 .handle.handle_bytes = MAX_HANDLE_SZ
         };
 
                 .handle.handle_bytes = MAX_HANDLE_SZ
         };
 

-        int mount_id, mount_id_parent;
+        int mount_id = -1, mount_id_parent = -1;

         _cleanup_free_ char *parent = NULL;
         struct stat a, b;
         int r;
         _cleanup_free_ char *parent = NULL;
         struct stat a, b;
         int r;


@@ -473,7 +473,11 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
 
         r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
         if (r < 0) {
 
         r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
         if (r < 0) {

-                if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
+                if (errno == ENOSYS)
+                        /* This kernel does not support name_to_handle_at()
+                         * fall back to the traditional stat() logic. */
+                        goto fallback;
+                else if (errno == EOPNOTSUPP)

                         /* This kernel or file system does not support
                          * name_to_handle_at(), hence fallback to the
                          * traditional stat() logic */
                         /* This kernel or file system does not support
                          * name_to_handle_at(), hence fallback to the
                          * traditional stat() logic */