@@ -3688,7 +3688,7 @@ FIXTURE_TEARDOWN(ftruncate)
3688
3688
FIXTURE_VARIANT (ftruncate )
3689
3689
{
3690
3690
const __u64 handled ;
3691
- const __u64 permitted ;
3691
+ const __u64 allowed ;
3692
3692
const int expected_open_result ;
3693
3693
const int expected_ftruncate_result ;
3694
3694
};
@@ -3697,7 +3697,7 @@ FIXTURE_VARIANT(ftruncate)
3697
3697
FIXTURE_VARIANT_ADD (ftruncate , w_w ) {
3698
3698
/* clang-format on */
3699
3699
.handled = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3700
- .permitted = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3700
+ .allowed = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3701
3701
.expected_open_result = 0 ,
3702
3702
.expected_ftruncate_result = 0 ,
3703
3703
};
@@ -3706,7 +3706,7 @@ FIXTURE_VARIANT_ADD(ftruncate, w_w) {
3706
3706
FIXTURE_VARIANT_ADD (ftruncate , t_t ) {
3707
3707
/* clang-format on */
3708
3708
.handled = LANDLOCK_ACCESS_FS_TRUNCATE ,
3709
- .permitted = LANDLOCK_ACCESS_FS_TRUNCATE ,
3709
+ .allowed = LANDLOCK_ACCESS_FS_TRUNCATE ,
3710
3710
.expected_open_result = 0 ,
3711
3711
.expected_ftruncate_result = 0 ,
3712
3712
};
@@ -3715,7 +3715,7 @@ FIXTURE_VARIANT_ADD(ftruncate, t_t) {
3715
3715
FIXTURE_VARIANT_ADD (ftruncate , wt_w ) {
3716
3716
/* clang-format on */
3717
3717
.handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
3718
- .permitted = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3718
+ .allowed = LANDLOCK_ACCESS_FS_WRITE_FILE ,
3719
3719
.expected_open_result = 0 ,
3720
3720
.expected_ftruncate_result = EACCES ,
3721
3721
};
@@ -3724,8 +3724,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_w) {
3724
3724
FIXTURE_VARIANT_ADD (ftruncate , wt_wt ) {
3725
3725
/* clang-format on */
3726
3726
.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 ,
3729
3728
.expected_open_result = 0 ,
3730
3729
.expected_ftruncate_result = 0 ,
3731
3730
};
@@ -3734,7 +3733,7 @@ FIXTURE_VARIANT_ADD(ftruncate, wt_wt) {
3734
3733
FIXTURE_VARIANT_ADD (ftruncate , wt_t ) {
3735
3734
/* clang-format on */
3736
3735
.handled = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_TRUNCATE ,
3737
- .permitted = LANDLOCK_ACCESS_FS_TRUNCATE ,
3736
+ .allowed = LANDLOCK_ACCESS_FS_TRUNCATE ,
3738
3737
.expected_open_result = EACCES ,
3739
3738
};
3740
3739
@@ -3744,7 +3743,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate)
3744
3743
const struct rule rules [] = {
3745
3744
{
3746
3745
.path = path ,
3747
- .access = variant -> permitted ,
3746
+ .access = variant -> allowed ,
3748
3747
},
3749
3748
{},
3750
3749
};
@@ -3785,7 +3784,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate_in_different_processes)
3785
3784
const struct rule rules [] = {
3786
3785
{
3787
3786
.path = path ,
3788
- .access = variant -> permitted ,
3787
+ .access = variant -> allowed ,
3789
3788
},
3790
3789
{},
3791
3790
};
0 commit comments