[PATCH v10 10/13] selftests/landlock: Share enforce_ruleset()
Konstantin Meskhidze (A)
konstantin.meskhidze at huawei.com
Thu Apr 20 16:06:30 UTC 2023
4/16/2023 7:12 PM, Mickaël Salaün пишет:
>
> On 23/03/2023 09:52, Konstantin Meskhidze wrote:
>> This commit moves enforce_ruleset() helper function to common.h so that
>> to be used both by filesystem tests and network ones.
>
> "so that it can be used"
Got it.
>
>
>>
>> Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze at huawei.com>
>> ---
>>
>> 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 | 10 ----------
>> 2 files changed, 10 insertions(+), 10 deletions(-)
>>
>> 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 b6c4be3faf7a..b762b5419a89 100644
>> --- a/tools/testing/selftests/landlock/fs_test.c
>> +++ b/tools/testing/selftests/landlock/fs_test.c
>> @@ -598,16 +598,6 @@ 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(layout1, proc_nsfs)
>> {
>> const struct rule rules[] = {
>> --
>> 2.25.1
>>
> .
More information about the Linux-security-module-archive
mailing list