From 9e760cfa976bafbe51608650ea08257e4e8bae9a Mon Sep 17 00:00:00 2001 From: Taylor Jackson Date: Tue, 26 Mar 2024 20:33:52 +0000 Subject: [PATCH] vfs/idmapped_mounts.c: Change mount_setattr expected output MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Zorro Lang Reviewed-by: Christian Brauner Signed-off-by: Zorro Lang --- src/vfs/idmapped-mounts.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vfs/idmapped-mounts.c b/src/vfs/idmapped-mounts.c index 34052ca3..f4dfc3f3 100644 --- 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. */ -- 2.47.3