Christian Brauner <brauner@xxxxxxxxxx> writes:
> When ext4 is used with quota support the test fails with EINVAL because
> it is run after we idmapped the mount. If the caller's fs{g,u}ids aren't
> mapped then we fail and log a misleading error. Move the checks for
> tmpfile support right at the beginning of the test in all tests.
>
> Reported-by: Luis Henriques <lhenriques@xxxxxxx>
> Link: https://lore.kernel.org/r/20240222-knast-reifen-953312ce17a9@brauner
> Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
FWIW I've just tested this patch and I can confirm it fixes the failures I
was seeing in ext4. Again, thanks a lot, Christian.
Cheers,
--
Luís
> ---
> src/vfs/idmapped-mounts.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/src/vfs/idmapped-mounts.c b/src/vfs/idmapped-mounts.c
> index 547182fe..e490f3d7 100644
> --- a/src/vfs/idmapped-mounts.c
> +++ b/src/vfs/idmapped-mounts.c
> @@ -3815,6 +3815,8 @@ int tcore_setgid_create_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -3838,8 +3840,6 @@ int tcore_setgid_create_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> pid = fork();
> if (pid < 0) {
> log_stderr("failure: fork");
> @@ -3991,6 +3991,8 @@ int tcore_setgid_create_idmapped_in_userns(const struct vfstest_info *info)
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -4014,8 +4016,6 @@ int tcore_setgid_create_idmapped_in_userns(const struct vfstest_info *info)
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> pid = fork();
> if (pid < 0) {
> log_stderr("failure: fork");
> @@ -7715,6 +7715,8 @@ static int setgid_create_umask_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -7738,8 +7740,6 @@ static int setgid_create_umask_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> pid = fork();
> if (pid < 0) {
> log_stderr("failure: fork");
> @@ -7929,6 +7929,8 @@ static int setgid_create_umask_idmapped_in_userns(const struct vfstest_info *inf
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -7952,8 +7954,6 @@ static int setgid_create_umask_idmapped_in_userns(const struct vfstest_info *inf
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> /*
> * Below we verify that setgid inheritance for a newly created file or
> * directory works correctly. As part of this we need to verify that
> @@ -8163,6 +8163,8 @@ static int setgid_create_acl_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -8186,8 +8188,6 @@ static int setgid_create_acl_idmapped(const struct vfstest_info *info)
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> pid = fork();
> if (pid < 0) {
> log_stderr("failure: fork");
> @@ -8518,6 +8518,8 @@ static int setgid_create_acl_idmapped_in_userns(const struct vfstest_info *info)
> goto out;
> }
>
> + supported = openat_tmpfile_supported(info->t_dir1_fd);
> +
> /* Changing mount properties on a detached mount. */
> attr.userns_fd = get_userns_fd(0, 10000, 10000);
> if (attr.userns_fd < 0) {
> @@ -8541,8 +8543,6 @@ static int setgid_create_acl_idmapped_in_userns(const struct vfstest_info *info)
> goto out;
> }
>
> - supported = openat_tmpfile_supported(open_tree_fd);
> -
> /*
> * Below we verify that setgid inheritance for a newly created file or
> * directory works correctly. As part of this we need to verify that
> --
>
> 2.43.0
>
