@@ -3688,7 +3688,7 @@ FIXTURE_TEARDOWN(ftruncate)
36883688FIXTURE_VARIANT (ftruncate )
36893689{
36903690 const __u64 handled ;
3691- const __u64 permitted ;
3691+ const __u64 allowed ;
36923692 const int expected_open_result ;
36933693 const int expected_ftruncate_result ;
36943694};
@@ -3697,7 +3697,7 @@ FIXTURE_VARIANT(ftruncate)
36973697FIXTURE_VARIANT_ADD (ftruncate , w_w ) {
36983698 /* clang-format on */
36993699 .handled = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3700- .permitted = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3700+ .allowed = LANDLOCK_ACCESS_FS_WRITE_FILE ,
37013701 .expected_open_result = 0 ,
37023702 .expected_ftruncate_result = 0 ,
37033703};
@@ -3706,7 +3706,7 @@ FIXTURE_VARIANT_ADD(ftruncate, w_w) {
37063706FIXTURE_VARIANT_ADD (ftruncate , t_t ) {
37073707 /* clang-format on */
37083708 .handled = LANDLOCK_ACCESS_FS_TRUNCATE ,
3709- .permitted = LANDLOCK_ACCESS_FS_TRUNCATE ,
3709+ .allowed = LANDLOCK_ACCESS_FS_TRUNCATE ,
37103710 .expected_open_result = 0 ,
37113711 .expected_ftruncate_result = 0 ,
37123712};
@@ -3715,7 +3715,7 @@ FIXTURE_VARIANT_ADD(ftruncate, t_t) {
37153715FIXTURE_VARIANT_ADD (ftruncate , wt_w ) {
37163716 /* clang-format on */
37173717 .handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
3718- .permitted = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3718+ .allowed = LANDLOCK_ACCESS_FS_WRITE_FILE ,
37193719 .expected_open_result = 0 ,
37203720 .expected_ftruncate_result = EACCES ,
37213721};
@@ -3724,8 +3724,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_w) {
37243724FIXTURE_VARIANT_ADD (ftruncate , wt_wt ) {
37253725 /* clang-format on */
37263726 .handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
3727- .permitted = LANDLOCK_ACCESS_FS_WRITE_FILE |
3728- LANDLOCK_ACCESS_FS_TRUNCATE ,
3727+ .allowed = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
37293728 .expected_open_result = 0 ,
37303729 .expected_ftruncate_result = 0 ,
37313730};
@@ -3734,7 +3733,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_wt) {
37343733FIXTURE_VARIANT_ADD (ftruncate , wt_t ) {
37353734 /* clang-format on */
37363735 .handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
3737- .permitted = LANDLOCK_ACCESS_FS_TRUNCATE ,
3736+ .allowed = LANDLOCK_ACCESS_FS_TRUNCATE ,
37383737 .expected_open_result = EACCES ,
37393738};
37403739
@@ -3744,7 +3743,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate)
37443743 const struct rule rules [] = {
37453744 {
37463745 .path = path ,
3747- .access = variant -> permitted ,
3746+ .access = variant -> allowed ,
37483747 },
37493748 {},
37503749 };
@@ -3785,7 +3784,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate_in_different_processes)
37853784 const struct rule rules [] = {
37863785 {
37873786 .path = path ,
3788- .access = variant -> permitted ,
3787+ .access = variant -> allowed ,
37893788 },
37903789 {},
37913790 };
0 commit comments