Unverified Commit b838dd76 authored by Günther Noack's avatar Günther Noack Committed by Mickaël Salaün
Browse files

selftests/landlock: Rename "permitted" to "allowed" in ftruncate tests 



Suggested-by: default avatarMickaël Salaün <mic@digikod.net>
Signed-off-by: default avatarGünther Noack <gnoack@google.com>
Link: https://lore.kernel.org/r/20231208155121.1943775-3-gnoack@google.com


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

tools/testing/selftests/landlock/fs_test.c

+8 −9
Original line number Diff line number Diff line
@@ -3688,7 +3688,7 @@ FIXTURE_TEARDOWN(ftruncate) 
FIXTURE_VARIANT(ftruncate)

{

	const __u64 handled;

	const __u64 permitted;

	const __u64 allowed;

	const int expected_open_result;

	const int expected_ftruncate_result;

};
@@ -3697,7 +3697,7 @@ FIXTURE_VARIANT(ftruncate) 
FIXTURE_VARIANT_ADD(ftruncate, w_w) {

	/* clang-format on */

	.handled = LANDLOCK_ACCESS_FS_WRITE_FILE,

	.permitted = LANDLOCK_ACCESS_FS_WRITE_FILE,

	.allowed = LANDLOCK_ACCESS_FS_WRITE_FILE,

	.expected_open_result = 0,

	.expected_ftruncate_result = 0,

};
@@ -3706,7 +3706,7 @@ FIXTURE_VARIANT_ADD(ftruncate, w_w) { 
FIXTURE_VARIANT_ADD(ftruncate, t_t) {

	/* clang-format on */

	.handled = LANDLOCK_ACCESS_FS_TRUNCATE,

	.permitted = LANDLOCK_ACCESS_FS_TRUNCATE,

	.allowed = LANDLOCK_ACCESS_FS_TRUNCATE,

	.expected_open_result = 0,

	.expected_ftruncate_result = 0,

};
@@ -3715,7 +3715,7 @@ FIXTURE_VARIANT_ADD(ftruncate, t_t) { 
FIXTURE_VARIANT_ADD(ftruncate, wt_w) {

	/* clang-format on */

	.handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE,

	.permitted = LANDLOCK_ACCESS_FS_WRITE_FILE,

	.allowed = LANDLOCK_ACCESS_FS_WRITE_FILE,

	.expected_open_result = 0,

	.expected_ftruncate_result = EACCES,

};
@@ -3724,8 +3724,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_w) { 
FIXTURE_VARIANT_ADD(ftruncate, wt_wt) {

	/* clang-format on */

	.handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE,

	.permitted = LANDLOCK_ACCESS_FS_WRITE_FILE |

		     LANDLOCK_ACCESS_FS_TRUNCATE,

	.allowed = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE,

	.expected_open_result = 0,

	.expected_ftruncate_result = 0,

};
@@ -3734,7 +3733,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_wt) { 
FIXTURE_VARIANT_ADD(ftruncate, wt_t) {

	/* clang-format on */

	.handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE,

	.permitted = LANDLOCK_ACCESS_FS_TRUNCATE,

	.allowed = LANDLOCK_ACCESS_FS_TRUNCATE,

	.expected_open_result = EACCES,

};
@@ -3744,7 +3743,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate) 
	const struct rule rules[] = {

		{

			.path = path,

			.access = variant->permitted,

			.access = variant->allowed,

		},

		{},

	};
@@ -3785,7 +3784,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate_in_different_processes) 
		const struct rule rules[] = {

			{

				.path = path,

				.access = variant->permitted,

				.access = variant->allowed,

			},

			{},

		};