From: "Konstantin Meskhidze (A)" <konstantin.meskhidze@huawei.com>
To: "Mickaël Salaün" <mic@digikod.net>
Cc: <willemdebruijn.kernel@gmail.com>, <gnoack3000@gmail.com>,
<linux-security-module@vger.kernel.org>, <netdev@vger.kernel.org>,
<netfilter-devel@vger.kernel.org>,
<anton.sirazetdinov@huawei.com>
Subject: Re: [PATCH v7 14/18] seltests/landlock: add rules overlapping test
Date: Sat, 10 Sep 2022 23:49:22 +0300 [thread overview]
Message-ID: <66b0eb2c-7c0e-57e4-77d9-2a94fd0ff3a0@huawei.com> (raw)
In-Reply-To: <25b7e8c8-1eba-1a8d-138b-988dabeeb2ae@digikod.net>
9/6/2022 11:09 AM, Mickaël Salaün пишет:
>
> On 29/08/2022 19:03, Konstantin Meskhidze wrote:
>> This patch adds overlapping rules for one port. First rule adds just
>> bind() access right for a port. The second one adds both bind() and
>> connect() access rights for the same port.
>>
>> Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
>> ---
>>
>> Changes since v6:
>> * None.
>>
>> Changes since v5:
>> * Formats code with clang-format-14.
>>
>> Changes since v4:
>> * Refactors code with self->port, self->addr4 variables.
>>
>> Changes since v3:
>> * Adds ruleset_overlap test.
>>
>> ---
>> tools/testing/selftests/landlock/net_test.c | 89 +++++++++++++++++++++
>> 1 file changed, 89 insertions(+)
>>
>> diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c
>> index 40aef7c683af..b3b38745f4eb 100644
>> --- a/tools/testing/selftests/landlock/net_test.c
>> +++ b/tools/testing/selftests/landlock/net_test.c
>> @@ -464,4 +464,93 @@ TEST_F(socket, connect_afunspec_with_restictions)
>> ASSERT_EQ(1, WIFEXITED(status));
>> ASSERT_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
>> }
>> +
>> +TEST_F(socket, ruleset_overlap)
>> +{
>> + int sockfd;
>> + int one = 1;
>> +
>> + struct landlock_ruleset_attr ruleset_attr = {
>> + .handled_access_net = LANDLOCK_ACCESS_NET_BIND_TCP |
>> + LANDLOCK_ACCESS_NET_CONNECT_TCP,
>> + };
>> + struct landlock_net_service_attr net_service_1 = {
>> + .allowed_access = LANDLOCK_ACCESS_NET_BIND_TCP,
>> +
>> + .port = self->port[0],
>> + };
>> +
>> + struct landlock_net_service_attr net_service_2 = {
>> + .allowed_access = LANDLOCK_ACCESS_NET_BIND_TCP |
>> + LANDLOCK_ACCESS_NET_CONNECT_TCP,
>> +
>> + .port = self->port[0],
>> + };
>> +
>> + int ruleset_fd =
>> + landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
>> + ASSERT_LE(0, ruleset_fd);
>> +
>> + /* Allows bind operations to the port[0] socket. */
>> + ASSERT_EQ(0, landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_SERVICE,
>> + &net_service_1, 0));
>> + /* Allows connect and bind operations to the port[0] socket. */
>> + ASSERT_EQ(0, landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_SERVICE,
>> + &net_service_2, 0));
>> +
>> + /* Enforces the ruleset. */
>> + enforce_ruleset(_metadata, ruleset_fd);
>> +
>> + /* Creates a server socket. */
>> + sockfd = create_socket_variant(variant, SOCK_STREAM);
>> + ASSERT_LE(0, sockfd);
>> + /* Allows to reuse of local address. */
>> + ASSERT_EQ(0, setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &one,
>> + sizeof(one)));
>> +
>> + /* Binds the socket to address with port[0]. */
>> + ASSERT_EQ(0, bind_variant(variant, sockfd, self, 0));
>> +
>> + /* Makes connection to socket with port[0]. */
>> + ASSERT_EQ(0, connect_variant(variant, sockfd, self, 0));
>> +
>> + /* Closes socket. */
>> + ASSERT_EQ(0, close(sockfd));
>> +
>> + /* Creates another ruleset layer. */
>> + ruleset_fd =
>> + landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
>> + ASSERT_LE(0, ruleset_fd);
>> +
>> + /*
>> + * Allows bind operations to the port[0] socket in
>> + * the new ruleset layer.
>> + */
>> + ASSERT_EQ(0, landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_SERVICE,
>> + &net_service_1, 0));
>> +
>> + /* Enforces the new ruleset. */
>> + enforce_ruleset(_metadata, ruleset_fd);
>> +
>> + /* Creates a server socket. */
>> + sockfd = create_socket_variant(variant, SOCK_STREAM);
>> + ASSERT_LE(0, sockfd);
>> + /* Allows to reuse of local address. */
>> + ASSERT_EQ(0, setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &one,
>> + sizeof(one)));
>> +
>> + /* Binds the socket to address with port[0]. */
>> + ASSERT_EQ(0, bind_variant(variant, sockfd, self, 0));
>> +
>> + /*
>> + * Forbids to connect the socket to address with port[0],
>> + * cause just one ruleset layer has connect() access rule.
>
> s/cause/because/ (everywhere)
Ok. I will rewrite it.
> .
next prev parent reply other threads:[~2022-09-10 20:49 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 17:03 [PATCH v7 00/18] Network support for Landlock Konstantin Meskhidze
2022-08-29 17:03 ` [PATCH v7 01/18] landlock: rename access mask Konstantin Meskhidze
2022-09-06 8:06 ` Mickaël Salaün
2022-09-09 10:42 ` Konstantin Meskhidze (A)
2022-09-12 17:16 ` Mickaël Salaün
2022-08-29 17:03 ` [PATCH v7 02/18] landlock: refactor landlock_find_rule/insert_rule Konstantin Meskhidze
2022-09-06 8:07 ` Mickaël Salaün
2022-09-09 10:48 ` Konstantin Meskhidze (A)
2022-09-12 17:17 ` Mickaël Salaün
2022-10-12 8:37 ` Konstantin Meskhidze (A)
2022-10-12 10:06 ` Mickaël Salaün
2022-10-12 11:13 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 03/18] landlock: refactor merge/inherit_ruleset functions Konstantin Meskhidze
2022-09-06 8:07 ` Mickaël Salaün
2022-09-09 14:53 ` Konstantin Meskhidze (A)
2022-09-12 17:17 ` Mickaël Salaün
2022-08-29 17:03 ` [PATCH v7 04/18] landlock: move helper functions Konstantin Meskhidze
2022-09-06 8:07 ` Mickaël Salaün
2022-09-10 16:50 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 05/18] landlock: refactor " Konstantin Meskhidze
2022-09-06 8:07 ` Mickaël Salaün
2022-09-10 17:20 ` Konstantin Meskhidze (A)
2022-09-12 17:18 ` Mickaël Salaün
2022-08-29 17:03 ` [PATCH v7 06/18] landlock: refactor landlock_add_rule syscall Konstantin Meskhidze
2022-08-29 17:03 ` [PATCH v7 07/18] landlock: user space API network support Konstantin Meskhidze
2022-09-06 8:08 ` Mickaël Salaün
2022-09-10 17:25 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 08/18] landlock: add network rules support Konstantin Meskhidze
2022-09-06 8:08 ` Mickaël Salaün
2022-09-10 18:27 ` Konstantin Meskhidze (A)
2022-09-12 17:18 ` Mickaël Salaün
2022-08-29 17:03 ` [PATCH v7 09/18] landlock: implement TCP network hooks Konstantin Meskhidze
2022-09-06 8:08 ` Mickaël Salaün
2022-09-10 20:28 ` Konstantin Meskhidze (A)
2022-09-12 17:18 ` Mickaël Salaün
2022-08-29 17:03 ` [PATCH v7 10/18] seltests/landlock: move helper function Konstantin Meskhidze
2022-09-06 8:09 ` Mickaël Salaün
2022-09-10 20:29 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 11/18] seltests/landlock: add tests for bind() hooks Konstantin Meskhidze
2022-09-06 8:09 ` Mickaël Salaün
2022-09-10 20:47 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 12/18] seltests/landlock: add tests for connect() hooks Konstantin Meskhidze
2022-08-29 17:03 ` [PATCH v7 13/18] seltests/landlock: add AF_UNSPEC family test Konstantin Meskhidze
2022-09-06 8:09 ` Mickaël Salaün
2022-09-10 20:48 ` Konstantin Meskhidze (A)
2022-08-29 17:03 ` [PATCH v7 14/18] seltests/landlock: add rules overlapping test Konstantin Meskhidze
2022-09-06 8:09 ` Mickaël Salaün
2022-09-10 20:49 ` Konstantin Meskhidze (A) [this message]
2022-08-29 17:03 ` [PATCH v7 15/18] seltests/landlock: add ruleset expanding test Konstantin Meskhidze
2022-08-29 17:03 ` [PATCH v7 16/18] seltests/landlock: add invalid input data test Konstantin Meskhidze
2022-09-06 8:09 ` Mickaël Salaün
2022-09-10 20:51 ` Konstantin Meskhidze (A)
2022-09-12 17:22 ` Mickaël Salaün
2022-10-10 10:37 ` Mickaël Salaün
2022-10-11 7:55 ` Konstantin Meskhidze (A)
2022-10-11 8:32 ` Mickaël Salaün
2022-08-29 17:04 ` [PATCH v7 17/18] samples/landlock: add network demo Konstantin Meskhidze
2022-09-06 8:10 ` Mickaël Salaün
2022-09-10 20:59 ` Konstantin Meskhidze (A)
2022-09-12 17:23 ` Mickaël Salaün
2022-08-29 17:04 ` [PATCH v7 18/18] landlock: Document Landlock's network support Konstantin Meskhidze
2022-09-06 8:12 ` Mickaël Salaün
2022-09-10 21:14 ` Konstantin Meskhidze (A)
2022-09-12 17:23 ` Mickaël Salaün
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=66b0eb2c-7c0e-57e4-77d9-2a94fd0ff3a0@huawei.com \
--to=konstantin.meskhidze@huawei.com \
--cc=anton.sirazetdinov@huawei.com \
--cc=gnoack3000@gmail.com \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).