[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e3f09e66-3eb8-96d0-3cfd-f4aa1d0f332c@huawei.com>
Date: Sat, 10 Sep 2022 23:29:36 +0300
From: "Konstantin Meskhidze (A)" <konstantin.meskhidze@...wei.com>
To: Mickaël Salaün <mic@...ikod.net>
CC: <willemdebruijn.kernel@...il.com>, <gnoack3000@...il.com>,
<linux-security-module@...r.kernel.org>, <netdev@...r.kernel.org>,
<netfilter-devel@...r.kernel.org>, <anton.sirazetdinov@...wei.com>
Subject: Re: [PATCH v7 10/18] seltests/landlock: move helper function
9/6/2022 11:09 AM, Mickaël Salaün пишет:
> Please be a bit more specific in the subject: "selftests/landlock: Share
> enforce_ruleset()"
Ok. Thanks.
>
> BTW, as I already said, you need to replace all your "seltests" with
> "selftests".
My mistake. Its a silly typo. I will fix it.
>
>
>
> On 29/08/2022 19:03, 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.
>>
>> Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@...wei.com>
>> ---
>>
>> 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 7ba18eb23783..48870afb054b 100644
>> --- a/tools/testing/selftests/landlock/common.h
>> +++ b/tools/testing/selftests/landlock/common.h
>> @@ -187,3 +187,13 @@ clear_cap(struct __test_metadata *const _metadata, const cap_value_t caps)
>> {
>> _effective_cap(_metadata, caps, CAP_CLEAR);
>> }
>> +
>> +__attribute__((__unused__)) 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));
>> + }
>> +}
>> diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
>> index debe2d9ea6cf..25a655891754 100644
>> --- a/tools/testing/selftests/landlock/fs_test.c
>> +++ b/tools/testing/selftests/landlock/fs_test.c
>> @@ -556,16 +556,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
>>
> .
Powered by blists - more mailing lists