Skip to contentSkip to conversation

fstest generic/696 failure on ext4 fs with quotas+idmap

PATCH In review Luis Henriques 3 participants 7 messages Feb 21, 2024 – Feb 26, 2024

lore
Share & tools
lore
#0 lore raw

Hi!

The fstest generic/696 (and 697) fail on ext4 when the filesystem is created with quota support (-O quota). It's really easy to reproduce, and it fails when doing the idmapped tests (setgid_create_umask_idmapped() and setgid_create_umask_idmapped_in_userns()).

The failure happens when the test does an openat() with O_TMPFILE:

ext4_tmpfile()

    __ext4_new_inode()
      dquot_initialize()
        dqget()

and at this point the error occurs:

	if (!qid_has_mapping(sb->s_user_ns, qid))
		return ERR_PTR(-EINVAL);

qid is '-1', which is invalid, but I'm failing to understand if it should really be invalid or if dqget() should handle this invalid qid some other way. Earlier, __ext4_new_inode() called inode_init_owner(), which indeed sets inode->i_uid with '-1'.

I've been trying to figure it out, but it's very tricky to follow all the details, so I decided to ask here and see if anyone has any idea. Is this a known issue? Maybe the issue is with the test itself, and not with ext4, quota or idmapped code.

Cheers,

Signature · 1 line
Luís
#1 lore raw

PATCH 1/1 vfs: fix check for tmpfile support

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.

---
 src/vfs/idmapped-mounts.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
src/vfs/idmapped-mounts.c +12 -12
index 547182fe..e490f3d7 100644
@@ -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
Signature · 1 line
2.43.0
#5 lore raw
In reply to Luis Henriques
Quoted 16 lines · Luis Henriques

Hi!

The fstest generic/696 (and 697) fail on ext4 when the filesystem is created with quota support (-O quota). It's really easy to reproduce, and it fails when doing the idmapped tests (setgid_create_umask_idmapped() and setgid_create_umask_idmapped_in_userns()).

The failure happens when the test does an openat() with O_TMPFILE:

ext4_tmpfile()

    __ext4_new_inode()
      dquot_initialize()
        dqget()

and at this point the error occurs:

Quoted 7 lines
	if (!qid_has_mapping(sb->s_user_ns, qid))
		return ERR_PTR(-EINVAL);

qid is '-1', which is invalid, but I'm failing to understand if it should really be invalid or if dqget() should handle this invalid qid some other way. Earlier, __ext4_new_inode() called inode_init_owner(), which indeed sets inode->i_uid with '-1'.

I think that's a misanalysis? The dquot_initialize happens to be before the inode creation for that tmpfile. Anyway, see below.

Quoted 5 lines

I've been trying to figure it out, but it's very tricky to follow all the details, so I decided to ask here and see if anyone has any idea. Is this a known issue? Maybe the issue is with the test itself, and not with ext4, quota or idmapped code.

So good new is that it's neither an ext4, quota, or idmapped bug. It's just the test being broken because openat_tmpfile_supported() is called after we created an idmapped mount on the idmapped mount which means that the callers fs{g,u}id might not be mapped. That means make_kquid_*id() will return INVALID_*ID which will later fail that check whether the qid is mapped in dqget().

I sent a patch to xfstests with you can ext4 Cced. I've tested it here and it's fixed. Feel free to test as well.

#6 lore raw
Quoted 41 lines · Christian Brauner
Quoted 16 lines · Luis Henriques

Hi!

The fstest generic/696 (and 697) fail on ext4 when the filesystem is created with quota support (-O quota). It's really easy to reproduce, and it fails when doing the idmapped tests (setgid_create_umask_idmapped() and setgid_create_umask_idmapped_in_userns()).

The failure happens when the test does an openat() with O_TMPFILE:

ext4_tmpfile()

    __ext4_new_inode()
      dquot_initialize()
        dqget()

and at this point the error occurs:

Quoted 7 lines
	if (!qid_has_mapping(sb->s_user_ns, qid))
		return ERR_PTR(-EINVAL);

qid is '-1', which is invalid, but I'm failing to understand if it should really be invalid or if dqget() should handle this invalid qid some other way. Earlier, __ext4_new_inode() called inode_init_owner(), which indeed sets inode->i_uid with '-1'.

I think that's a misanalysis? The dquot_initialize happens to be before the inode creation for that tmpfile. Anyway, see below.

Quoted 5 lines

I've been trying to figure it out, but it's very tricky to follow all the details, so I decided to ask here and see if anyone has any idea. Is this a known issue? Maybe the issue is with the test itself, and not with ext4, quota or idmapped code.

So good new is that it's neither an ext4, quota, or idmapped bug. It's just the test being broken because openat_tmpfile_supported() is called after we created an idmapped mount on the idmapped mount which means that the callers fs{g,u}id might not be mapped. That means make_kquid_*id() will return INVALID_*ID which will later fail that check whether the qid is mapped in dqget().

Quoted 2 lines

I sent a patch to xfstests with you can ext4 Cced. I've tested it here and it's fixed. Feel free to test as well.

Wow! Awesome, thanks a lot for looking into this, Christian. I'll test that patch, but from your description it looks like it should be fix.

Cheers,

Signature · 1 line
Luís
#2 lore raw

Re: [PATCH] vfs: fix check for tmpfile support

In reply to Christian Brauner
Quoted 8 lines · Christian Brauner

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.

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,

Signature · 1 line
Luís
Quoted 120 lines
---
 src/vfs/idmapped-mounts.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
src/vfs/idmapped-mounts.c +12 -12
index 547182fe..e490f3d7 100644
@@ -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
Signature · 1 line
2.43.0
#3 lore raw

Re: [PATCH] vfs: fix check for tmpfile support

Quoted 7 lines · Luis Henriques
Quoted 5 lines · Christian Brauner

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.

Quoted 6 lines
Quoted 3 lines

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.

Thanks for your confirm, I think we can have your "Tested-by" if you don't mind.

Quoted 128 lines

Cheers,

Signature · 1 line
Luís
Quoted 120 lines
---
 src/vfs/idmapped-mounts.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
src/vfs/idmapped-mounts.c +12 -12
index 547182fe..e490f3d7 100644
@@ -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
Signature · 1 line
2.43.0
author Tested-by
#4 lore raw

Re: [PATCH] vfs: fix check for tmpfile support

Quoted 12 lines · Zorro Lang
Quoted 11 lines · Luis Henriques
Quoted 8 lines · Christian Brauner

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.

Quoted 5 lines
Quoted 2 lines

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.

Thanks for your confirm, I think we can have your "Tested-by" if you don't mind.

Ah, yes of course. I should have sent it explicitly.

Cheers,

Signature · 1 line
Luís
Quoted 124 lines
Quoted 123 lines
Quoted 121 lines
---
 src/vfs/idmapped-mounts.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
src/vfs/idmapped-mounts.c +12 -12
index 547182fe..e490f3d7 100644
@@ -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
Signature · 1 line
2.43.0