| Message ID | 20230920092641.832134-10-konstantin.meskhidze@huawei.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Network support for Landlock | expand |
On Wed, Sep 20, 2023 at 05:26:37PM +0800, Konstantin Meskhidze wrote: > This commit moves enforce_ruleset() helper function to common.h so that > it can be used both by filesystem tests and network ones. > > Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> > --- > > Changes since v11: > * None. > > diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c > index 251594306d40..7c94d3933b68 100644 > --- a/tools/testing/selftests/landlock/fs_test.c > +++ b/tools/testing/selftests/landlock/fs_test.c > @@ -677,17 +677,7 @@ static int create_ruleset(struct __test_metadata *const _metadata, > return ruleset_fd; > } > > -static void enforce_ruleset(struct __test_metadata *const _metadata, > - const int ruleset_fd) > -{ > - ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)); > - ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0)) > - { > - TH_LOG("Failed to enforce ruleset: %s", strerror(errno)); > - } > -} > - > -TEST_F_FORK(layout0, proc_nsfs) > +TEST_F_FORK(layout1, proc_nsfs) Why this change? > { > const struct rule rules[] = { > { > -- > 2.25.1 >
10/2/2023 11:26 PM, Mickaël Salaün пишет: > On Wed, Sep 20, 2023 at 05:26:37PM +0800, Konstantin Meskhidze wrote: >> This commit moves enforce_ruleset() helper function to common.h so that >> it can be used both by filesystem tests and network ones. >> >> Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> >> --- >> >> Changes since v11: >> * None. >> > >> diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c >> index 251594306d40..7c94d3933b68 100644 >> --- a/tools/testing/selftests/landlock/fs_test.c >> +++ b/tools/testing/selftests/landlock/fs_test.c >> @@ -677,17 +677,7 @@ static int create_ruleset(struct __test_metadata *const _metadata, >> return ruleset_fd; >> } >> >> -static void enforce_ruleset(struct __test_metadata *const _metadata, >> - const int ruleset_fd) >> -{ >> - ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)); >> - ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0)) >> - { >> - TH_LOG("Failed to enforce ruleset: %s", strerror(errno)); >> - } >> -} >> - >> -TEST_F_FORK(layout0, proc_nsfs) >> +TEST_F_FORK(layout1, proc_nsfs) > > Why this change? Looks like a bug coming from v11 version. You have added layout0 recently. in V11 version there was TEST_F_FORK(layout1, proc_nsfs), and I missed the changed , resolving conflict with layout1. Will be fixed. Thanks. > >> { >> const struct rule rules[] = { >> { >> -- >> 2.25.1 >> > .
diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h index d7987ae8d7fc..0fd6c4cf5e6f 100644 --- a/tools/testing/selftests/landlock/common.h +++ b/tools/testing/selftests/landlock/common.h @@ -256,3 +256,13 @@ static int __maybe_unused send_fd(int usock, int fd_tx) return -errno; return 0; } + +static void __maybe_unused +enforce_ruleset(struct __test_metadata *const _metadata, const int ruleset_fd) +{ + ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)); + ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0)) + { + TH_LOG("Failed to enforce ruleset: %s", strerror(errno)); + } +} diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index 251594306d40..7c94d3933b68 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -677,17 +677,7 @@ static int create_ruleset(struct __test_metadata *const _metadata, return ruleset_fd; } -static void enforce_ruleset(struct __test_metadata *const _metadata, - const int ruleset_fd) -{ - ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)); - ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0)) - { - TH_LOG("Failed to enforce ruleset: %s", strerror(errno)); - } -} - -TEST_F_FORK(layout0, proc_nsfs) +TEST_F_FORK(layout1, proc_nsfs) { const struct rule rules[] = { {
This commit moves enforce_ruleset() helper function to common.h so that it can be used both by filesystem tests and network ones. Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> --- Changes since v11: * None. Changes since v10: * Refactors commit message. Changes since v9: * None. Changes since v8: * Adds __maybe_unused attribute for enforce_ruleset() helper. Changes since v7: * Refactors commit message. Changes since v6: * None. Changes since v5: * Splits commit. * Moves enforce_ruleset helper into common.h * Formats code with clang-format-14. --- tools/testing/selftests/landlock/common.h | 10 ++++++++++ tools/testing/selftests/landlock/fs_test.c | 12 +----------- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.25.1