Unverified Commit 7e4042ab authored by Mickaël Salaün's avatar Mickaël Salaün
Browse files

selftests/landlock: Fix FS tests when run on a private mount point 

According to the test environment, the mount point of the test's working
directory may be shared or not, which changes the visibility of the
nested "tmp" mount point for the test's parent process calling
umount("tmp").

This was spotted while running tests in containers [1], where mount
points are private.

Cc: Günther Noack <gnoack@google.com>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Link: https://github.com/landlock-lsm/landlock-test-tools/pull/4

 [1]
Fixes: 41cca054 ("selftests/harness: Fix TEST_F()'s vfork handling")
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20240511171445.904356-3-mic@digikod.net


Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
parent 37dc2e0d

tools/testing/selftests/landlock/fs_test.c

+9 −1
Original line number Diff line number Diff line
@@ -293,7 +293,15 @@ static void prepare_layout(struct __test_metadata *const _metadata) 
static void cleanup_layout(struct __test_metadata *const _metadata)

{

	set_cap(_metadata, CAP_SYS_ADMIN);

	EXPECT_EQ(0, umount(TMP_DIR));

	if (umount(TMP_DIR)) {

		/*

		 * According to the test environment, the mount point of the

		 * current directory may be shared or not, which changes the

		 * visibility of the nested TMP_DIR mount point for the test's

		 * parent process doing this cleanup.

		 */

		ASSERT_EQ(EINVAL, errno);

	}

	clear_cap(_metadata, CAP_SYS_ADMIN);

	EXPECT_EQ(0, remove_path(TMP_DIR));

}