Tests for fanotify on anonymous pipe
v2 cover Tests for fanotify on anonymous pipe
Petr,
This tests for a behavior that we consider broken since the dawn of fanotify.
The fix was merged to v6.5-rc1.
I've already posted backport patches for kernels > v5.0 [1]. I am not planning to post backport patches for older kernels.
Even though the two new test cases do not use FAN_REPORT_FID, fanotify14 requires FAN_REPORT_FID, so it is not going to run these test cases on kernel < v5.1 anyway.
You suggested to wait for stable tree to apply the backports [2], but this seems to be taking time. Since I am going on vacation next week, I am posting these tests, so you can merge them whenever you like.
Thanks,
Amir.
[1] https://lore.kernel.org/stable/[email protected]/
[2] https://lore.kernel.org/ltp/20230710155006.GA659329@pevik/
Changes since v1:
- Fix build warnings of uninitialized struct members
Amir Goldstein (3):
fanotify14: Use FAN_MARK_INODE semantic flag
fanotify14: Use named initializers
fanotify14: Test disallow sb/mount mark on anonymous pipe
.../kernel/syscalls/fanotify/fanotify14.c | 198 +++++++++++++----- 1 file changed, 150 insertions(+), 48 deletions(-)
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/3 fanotify14: Use FAN_MARK_INODE semantic flag
FAN_MARK_INODE is defined as 0, but we use the semantic flag to improve the test case description.
--- testcases/kernel/syscalls/fanotify/fanotify14.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify14.c +6 -6
@@ -68,7 +68,7 @@ static struct test_case_t { {FLAGS_DESC(FAN_CLASS_PRE_CONTENT | FAN_REPORT_FID), {}, {}, EINVAL},/* INODE_EVENTS in mask without class FAN_REPORT_FID are not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), FLAGS_DESC(0), FLAGS_DESC(INODE_EVENTS), + {FLAGS_DESC(FAN_CLASS_NOTIF), FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(INODE_EVENTS), EINVAL},/* INODE_EVENTS in mask with FAN_MARK_MOUNT are not valid */
@@ -91,7 +91,7 @@ static struct test_case_t { {}, {}, EINVAL},/* FAN_RENAME without FAN_REPORT_NAME is not valid */ - {FLAGS_DESC (FAN_CLASS_NOTIF |FAN_REPORT_DFID_FID ),FLAGS_DESC (0 ), + {FLAGS_DESC (FAN_CLASS_NOTIF |FAN_REPORT_DFID_FID ),FLAGS_DESC (FAN_MARK_INODE ), FLAGS_DESC(FAN_RENAME), EINVAL},/* With FAN_MARK_ONLYDIR on non-dir is not valid */
@@ -100,19 +100,19 @@ static struct test_case_t {/* With FAN_REPORT_TARGET_FID, FAN_DELETE on non-dir is not valid */ {FLAGS_DESC (FAN_CLASS_NOTIF |FAN_REPORT_DFID_NAME_TARGET ), - FLAGS_DESC(0), FLAGS_DESC(FAN_DELETE), ENOTDIR}, + FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_DELETE), ENOTDIR},/* With FAN_REPORT_TARGET_FID, FAN_RENAME on non-dir is not valid */ {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(0), FLAGS_DESC(FAN_RENAME), ENOTDIR}, + FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_RENAME), ENOTDIR},/* With FAN_REPORT_TARGET_FID, FAN_ONDIR on non-dir is not valid */ {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(0), FLAGS_DESC(FAN_OPEN | FAN_ONDIR), ENOTDIR}, + FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_OPEN | FAN_ONDIR), ENOTDIR},/* With FAN_REPORT_TARGET_FID, FAN_EVENT_ON_CHILD on non-dir is not valid */ {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), -FLAGS_DESC (0 ),FLAGS_DESC (FAN_OPEN |FAN_EVENT_ON_CHILD ), +FLAGS_DESC (FAN_MARK_INODE ),FLAGS_DESC (FAN_OPEN |FAN_EVENT_ON_CHILD ), ENOTDIR}, /* FAN_MARK_IGNORE_SURV with FAN_DELETE on non-dir is not valid */
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 1/3] fanotify14: Use FAN_MARK_INODE semantic flag
Hi Amir,
Thanks!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/3 fanotify14: Use named initializers
In reply to Amir GoldsteinIn preparation for adding a new optional test case struct member.
--- .../kernel/syscalls/fanotify/fanotify14.c | 160 +++++++++++++----- 1 file changed, 114 insertions(+), 46 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify14.c +114 -46
@@ -62,92 +62,160 @@ static struct test_case_t { int expected_errno; } test_cases[] = { /* FAN_REPORT_FID without class FAN_CLASS_NOTIF is not valid */ - {FLAGS_DESC(FAN_CLASS_CONTENT | FAN_REPORT_FID), {}, {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_CONTENT | FAN_REPORT_FID), + .expected_errno = EINVAL, + }, /* FAN_REPORT_FID without class FAN_CLASS_NOTIF is not valid */ - {FLAGS_DESC(FAN_CLASS_PRE_CONTENT | FAN_REPORT_FID), {}, {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_PRE_CONTENT | FAN_REPORT_FID), + .expected_errno = EINVAL, + }, /* INODE_EVENTS in mask without class FAN_REPORT_FID are not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(INODE_EVENTS), - EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(INODE_EVENTS), + .expected_errno = EINVAL, + }, /* INODE_EVENTS in mask with FAN_MARK_MOUNT are not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_FID), - FLAGS_DESC(FAN_MARK_MOUNT), FLAGS_DESC(INODE_EVENTS), EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_FID), + .mark = FLAGS_DESC(FAN_MARK_MOUNT), + .mask = FLAGS_DESC(INODE_EVENTS), + .expected_errno = EINVAL, + }, /* FAN_REPORT_NAME without FAN_REPORT_DIR_FID is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_NAME), {}, {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_NAME), + .expected_errno = EINVAL, + }, /* FAN_REPORT_NAME without FAN_REPORT_DIR_FID is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_FID | FAN_REPORT_NAME), {}, - {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_FID | FAN_REPORT_NAME), + .expected_errno = EINVAL, + }, /* FAN_REPORT_TARGET_FID without FAN_REPORT_FID is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_NAME), - {}, {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_NAME), + .expected_errno = EINVAL, + }, /* FAN_REPORT_TARGET_FID without FAN_REPORT_NAME is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_FID), - {}, {}, EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_FID), + .expected_errno = EINVAL, + }, /* FAN_RENAME without FAN_REPORT_NAME is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_FID), FLAGS_DESC(FAN_MARK_INODE), - FLAGS_DESC(FAN_RENAME), EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_FID), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(FAN_RENAME), + .expected_errno = EINVAL, + }, /* With FAN_MARK_ONLYDIR on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), FLAGS_DESC(FAN_MARK_ONLYDIR), - FLAGS_DESC(FAN_OPEN), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_ONLYDIR), + .mask = FLAGS_DESC(FAN_OPEN), + .expected_errno = ENOTDIR, + }, /* With FAN_REPORT_TARGET_FID, FAN_DELETE on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_DELETE), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(FAN_DELETE), + .expected_errno = ENOTDIR, + }, /* With FAN_REPORT_TARGET_FID, FAN_RENAME on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_RENAME), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(FAN_RENAME), + .expected_errno = ENOTDIR, + }, /* With FAN_REPORT_TARGET_FID, FAN_ONDIR on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_OPEN | FAN_ONDIR), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(FAN_OPEN | FAN_ONDIR), + .expected_errno = ENOTDIR, + }, /* With FAN_REPORT_TARGET_FID, FAN_EVENT_ON_CHILD on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), - FLAGS_DESC(FAN_MARK_INODE), FLAGS_DESC(FAN_OPEN | FAN_EVENT_ON_CHILD), - ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME_TARGET), + .mark = FLAGS_DESC(FAN_MARK_INODE), + .mask = FLAGS_DESC(FAN_OPEN | FAN_EVENT_ON_CHILD), + .expected_errno = ENOTDIR, + }, /* FAN_MARK_IGNORE_SURV with FAN_DELETE on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), - FLAGS_DESC(FAN_MARK_IGNORE_SURV), FLAGS_DESC(FAN_DELETE), - ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), + .mark = FLAGS_DESC(FAN_MARK_IGNORE_SURV), + .mask = FLAGS_DESC(FAN_DELETE), + .expected_errno = ENOTDIR, + }, /* FAN_MARK_IGNORE_SURV with FAN_RENAME on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), - FLAGS_DESC(FAN_MARK_IGNORE_SURV), FLAGS_DESC(FAN_RENAME), - ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), + .mark = FLAGS_DESC(FAN_MARK_IGNORE_SURV), + .mask = FLAGS_DESC(FAN_RENAME), + .expected_errno = ENOTDIR, + }, /* FAN_MARK_IGNORE_SURV with FAN_ONDIR on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), - FLAGS_DESC(FAN_MARK_IGNORE_SURV), - FLAGS_DESC(FAN_OPEN | FAN_ONDIR), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), + .mark = FLAGS_DESC(FAN_MARK_IGNORE_SURV), + .mask = FLAGS_DESC(FAN_OPEN | FAN_ONDIR), + .expected_errno = ENOTDIR, + }, /* FAN_MARK_IGNORE_SURV with FAN_EVENT_ON_CHILD on non-dir is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), - FLAGS_DESC(FAN_MARK_IGNORE_SURV), - FLAGS_DESC(FAN_OPEN | FAN_EVENT_ON_CHILD), ENOTDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF | FAN_REPORT_DFID_NAME), + .mark = FLAGS_DESC(FAN_MARK_IGNORE_SURV), + .mask = FLAGS_DESC(FAN_OPEN | FAN_EVENT_ON_CHILD), + .expected_errno = ENOTDIR, + }, /* FAN_MARK_IGNORE without FAN_MARK_IGNORED_SURV_MODIFY on directory is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), FLAGS_DESC(FAN_MARK_IGNORE), - FLAGS_DESC(FAN_OPEN), EISDIR}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_IGNORE), + .mask = FLAGS_DESC(FAN_OPEN), + .expected_errno = EISDIR, + }, /* FAN_MARK_IGNORE without FAN_MARK_IGNORED_SURV_MODIFY on mount mark is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), - FLAGS_DESC(FAN_MARK_MOUNT | FAN_MARK_IGNORE), - FLAGS_DESC(FAN_OPEN), EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_MOUNT | FAN_MARK_IGNORE), + .mask = FLAGS_DESC(FAN_OPEN), + .expected_errno = EINVAL, + }, /* FAN_MARK_IGNORE without FAN_MARK_IGNORED_SURV_MODIFY on filesystem mark is not valid */ - {FLAGS_DESC(FAN_CLASS_NOTIF), - FLAGS_DESC(FAN_MARK_FILESYSTEM | FAN_MARK_IGNORE), - FLAGS_DESC(FAN_OPEN), EINVAL}, + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_FILESYSTEM | FAN_MARK_IGNORE), + .mask = FLAGS_DESC(FAN_OPEN), + .expected_errno = EINVAL, + }, }; static void do_test(unsigned int number)
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/3] fanotify14: Use named initializers
Hi Amir,
Thanks!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 3/3 fanotify14: Test disallow sb/mount mark on anonymous pipe
In reply to Amir GoldsteinThis case was retroactively disallowed.
This test is meant to encourage the backporting of commit 69562eb0bd3e ("fanotify: disallow mount/sb marks on kernel internal pseudo fs") to all stable kernels.
--- .../kernel/syscalls/fanotify/fanotify14.c | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-)
testcases/kernel/syscalls/fanotify/fanotify14.c +36 -2
@@ -19,6 +19,9 @@* * ceaf69f8eadc fanotify: do not allow setting dirent events in mask of non-dir * 8698e3bab4dd fanotify: refine the validation checks on non-dir inode mask +* +* The pipes test cases are regression tests for commit: +* 69562eb0bd3e fanotify: disallow mount/sb marks on kernel internal pseudo fs */ #define _GNU_SOURCE
@@ -40,6 +43,7 @@#define FLAGS_DESC (flags) {(flags), (#flags)} +static int pipes[2 ] = {-1 ,-1 };static int fanotify_fd;static int fan_report_target_fid_unsupported;static int ignore_mark_unsupported;
@@ -60,6 +64,7 @@ static struct test_case_t {/* when mask.flags == 0, fanotify_init() is expected to fail */ struct test_case_flags_t mask;int expected_errno; +int *pfd; } test_cases[] = {/* FAN_REPORT_FID without class FAN_CLASS_NOTIF is not valid */ {
@@ -216,6 +221,22 @@ static struct test_case_t { .mask = FLAGS_DESC(FAN_OPEN), .expected_errno = EINVAL, }, +/* mount mark on anonymous pipe is not valid */ + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_MOUNT), + .mask = { FAN_ACCESS, "anonymous pipe"}, + .pfd = pipes, + .expected_errno = EINVAL, + }, + /* filesystem mark on anonymous pipe is not valid */ + { + .init = FLAGS_DESC(FAN_CLASS_NOTIF), + .mark = FLAGS_DESC(FAN_MARK_FILESYSTEM), + .mask = { FAN_ACCESS, "anonymous pipe"}, + .pfd = pipes, + .expected_errno = EINVAL, + }, }; static void do_test(unsigned int number)
@@ -253,11 +274,17 @@ static void do_test(unsigned int number)/* Set mark on non-dir only when expecting error ENOTDIR */ const char *path = tc->expected_errno ==ENOTDIR ?FILE1 :MNTPOINT ; +int dirfd =AT_FDCWD ; + +if (tc->pfd) { + dirfd = tc->pfd[0 ]; + path =NULL ; + } -tst_res (TINFO ,"Testing fanotify_mark(FAN_MARK_ADD | %s, %s)" , +tst_res (TINFO ,"Testing %s with %s" , tc->mark.desc, tc->mask.desc);TST_EXP_FD_OR_FAIL (fanotify_mark (fanotify_fd,FAN_MARK_ADD | tc->mark.flags, - tc->mask.flags,AT_FDCWD , path), + tc->mask.flags, dirfd, path), tc->expected_errno);/*
@@ -299,12 +326,18 @@ static void do_setup(void)/* Create temporary test file to place marks on */ SAFE_FILE_PRINTF (FILE1 ,"0" ); +/* Create anonymous pipes to place marks on */ +SAFE_PIPE2 (pipes,O_CLOEXEC ); }static void do_cleanup (void ) {if (fanotify_fd >0 )SAFE_CLOSE (fanotify_fd); +if (pipes[0 ] !=-1 ) +SAFE_CLOSE (pipes[0 ]); +if (pipes[1 ] !=-1 ) +SAFE_CLOSE (pipes[1 ]); }static struct tst_test test = {
@@ -319,6 +352,7 @@ static struct tst_test test = { .tags = (const struct tst_tag[]) { {"linux-git" ,"ceaf69f8eadc" }, {"linux-git" ,"8698e3bab4dd" }, + {"linux-git" ,"69562eb0bd3e" }, {} } };
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 3/3] fanotify14: Test disallow sb/mount mark on anonymous pipe
Hi Amir,
Thanks!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Amir,
Quoted 9 lines
Petr,
This tests for a behavior that we consider broken since the dawn of fanotify.
The fix was merged to v6.5-rc1.
I've already posted backport patches for kernels > v5.0 [1]. I am not planning to post backport patches for older kernels.
Quoted 7 lines
Even though the two new test cases do not use
FAN_REPORT_FID, fanotify14 requiresFAN_REPORT_FID, so it is not going to run these test cases on kernel < v5.1 anyway.You suggested to wait for stable tree to apply the backports [2], but this seems to be taking time. Since I am going on vacation next week, I am posting these tests, so you can merge them whenever you like.
I was probably too conservative, whole patchset merged, thank you!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp