Commit 60e0a05d authored by zhouyuhang's avatar zhouyuhang Committed by JSY
Browse files

selftests/mount_setattr: fix idmap_mount_tree_invalid failed to run 

mainline inclusion
from mainline-v6.12-rc6
commit fa0122eaca4f14272fbf76a70d51db78c69091f6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB4DM2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fa0122eaca4f14272fbf76a70d51db78c69091f6

----------------------------------------------------------------------

[ Upstream commit fa0122eaca4f14272fbf76a70d51db78c69091f6 ]

Test case idmap_mount_tree_invalid failed to run on the newer kernel
with the following output:

 #  RUN           mount_setattr_idmapped.idmap_mount_tree_invalid ...
 # mount_setattr_test.c:1428:idmap_mount_tree_invalid:Expected sys_mount_setattr(open_tree_fd, "", AT_EMPTY_PATH, &attr,  sizeof(attr)) (0) ! = 0 (0)
 # idmap_mount_tree_invalid: Test terminated by assertion

This is because tmpfs is mounted at "/mnt/A", and tmpfs already
contains the flag FS_ALLOW_IDMAP after the commit 7a80e5b8 ("shmem:
support idmapped mounts for tmpfs"). So calling sys_mount_setattr here
returns 0 instead of -EINVAL as expected.

Ramfs does not support idmap mounts, so we can use it here to test invalid mounts,
which allows the test case to pass with the following output:

 # Starting 1 tests from 1 test cases.
 #  RUN           mount_setattr_idmapped.idmap_mount_tree_invalid ...
 #            OK  mount_setattr_idmapped.idmap_mount_tree_invalid
 ok 1 mount_setattr_idmapped.idmap_mount_tree_invalid
 # PASSED: 1 / 1 tests passed.

Link: https://lore.kernel.org/all/20241028084132.3212598-1-zhouyuhang1010@163.com/


Signed-off-by: default avatarzhouyuhang <zhouyuhang@kylinos.cn>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarJiangshan Yi <yijiangshan@kylinos.cn>
parent 19640fb0

tools/testing/selftests/mount_setattr/mount_setattr_test.c

+9 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,13 @@ TEST_F(mount_setattr_idmapped, idmap_mount_tree_invalid) 
	ASSERT_EQ(expected_uid_gid(-EBADF, "/tmp/B/b", 0, 0, 0), 0);

	ASSERT_EQ(expected_uid_gid(-EBADF, "/tmp/B/BB/b", 0, 0, 0), 0);



	ASSERT_EQ(mount("testing", "/mnt/A", "ramfs", MS_NOATIME | MS_NODEV,

			"size=100000,mode=700"), 0);



	ASSERT_EQ(mkdir("/mnt/A/AA", 0777), 0);



	ASSERT_EQ(mount("/tmp", "/mnt/A/AA", NULL, MS_BIND | MS_REC, NULL), 0);



	open_tree_fd = sys_open_tree(-EBADF, "/mnt/A",

				     AT_RECURSIVE |

				     AT_EMPTY_PATH |
@@ -1433,6 +1440,8 @@ TEST_F(mount_setattr_idmapped, idmap_mount_tree_invalid) 
	ASSERT_EQ(expected_uid_gid(-EBADF, "/tmp/B/BB/b", 0, 0, 0), 0);

	ASSERT_EQ(expected_uid_gid(open_tree_fd, "B/b", 0, 0, 0), 0);

	ASSERT_EQ(expected_uid_gid(open_tree_fd, "B/BB/b", 0, 0, 0), 0);



	(void)umount2("/mnt/A", MNT_DETACH);

}



TEST_F(mount_setattr, mount_attr_nosymfollow)