vfs/idmapped_mounts.c: Change mount_setattr expected output

In kernel commit dacfd001eaf2 (“fs/mnt_idmapping.c: Return -EINVAL
when no map is written”), the behavior of mount_setattr changed to
return EINVAL when attempting to create an idmapped mount when using
a user namespace with no mappings. The following commit updates the test
to expect no mount to be created in that case. And since no mount is created,
this commit also removes the check for overflow IDs because it does not make
sense to check for overflow IDs for a mount that was not created.

Signed-off-by: Taylor Jackson <tjackson9431@gmail.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/src/vfs/idmapped-mounts.c b/src/vfs/idmapped-mounts.c
index 34052ca387c667aeee2165bf19015b0194e5d43f..f4dfc3f3a9378519d863830855142bc70f070f16 100644 (file)
--- a/src/vfs/idmapped-mounts.c
+++ b/src/vfs/idmapped-mounts.c
@@ -6667,7 +6667,7 @@ static int nested_userns(const struct vfstest_info *info)
        }
 
        if (sys_mount_setattr(fd_open_tree_level4, "", AT_EMPTY_PATH,
-                             &attr_level4, sizeof(attr_level4))) {
+                             &attr_level4, sizeof(attr_level4)) != -1 || errno != EINVAL) {
                log_stderr("failure: sys_mount_setattr");
                goto out;
        }
@@ -6706,11 +6706,6 @@ static int nested_userns(const struct vfstest_info *info)
                        log_stderr("failure: check ownership %s", file);
                        goto out;
                }
-
-               if (!expected_uid_gid(fd_open_tree_level4, file, 0, info->t_overflowuid, info->t_overflowgid)) {
-                       log_stderr("failure: check ownership %s", file);
-                       goto out;
-               }
        }
 
        /* Verify that ownership looks correct for callers in the first userns. */