From: "Mickaël Salaün" <mic@digikod.net>
To: Paul Moore <paul@paul-moore.com>
Cc: "Mickaël Salaün" <mic@digikod.net>,
linux-security-module@vger.kernel.org, netdev@vger.kernel.org,
"Eric Dumazet" <edumazet@google.com>,
"Günther Noack" <gnoack@google.com>,
"Ivanov Mikhail" <ivanov.mikhail1@huawei-partners.com>,
"Konstantin Meskhidze" <konstantin.meskhidze@huawei.com>,
"Serge E . Hallyn" <serge@hallyn.com>
Subject: [PATCH v1 2/2] selftests/landlock: Improve AF_UNSPEC tests
Date: Wed, 27 Mar 2024 13:00:34 +0100 [thread overview]
Message-ID: <20240327120036.233641-2-mic@digikod.net> (raw)
In-Reply-To: <20240327120036.233641-1-mic@digikod.net>
Test that an IPv6 socket requested to be binded with AF_UNSPEC returns
-EAFNOSUPPORT if the sockaddr length is valid.
Cc: Eric Dumazet <edumazet@google.com>
Cc: Günther Noack <gnoack@google.com>
Cc: Ivanov Mikhail <ivanov.mikhail1@huawei-partners.com>
Cc: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Serge E. Hallyn <serge@hallyn.com>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
---
tools/testing/selftests/landlock/net_test.c | 37 +++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c
index f21cfbbc3638..f15cf565f856 100644
--- a/tools/testing/selftests/landlock/net_test.c
+++ b/tools/testing/selftests/landlock/net_test.c
@@ -673,6 +673,7 @@ TEST_F(protocol, bind_unspec)
.port = self->srv0.port,
};
int bind_fd, ret;
+ socklen_t inet_len, inet6_len, unix_len;
if (variant->sandbox == TCP_SANDBOX) {
const int ruleset_fd = landlock_create_ruleset(
@@ -736,12 +737,48 @@ TEST_F(protocol, bind_unspec)
if (variant->prot.domain == AF_INET) {
EXPECT_EQ(-EAFNOSUPPORT, ret);
} else {
+ /* The sockaddr length is less than SIN6_LEN_RFC2133. */
EXPECT_EQ(-EINVAL, ret)
{
TH_LOG("Wrong bind error: %s", strerror(errno));
}
}
EXPECT_EQ(0, close(bind_fd));
+
+ /* Stores the minimal sockaddr lengths per family. */
+ self->unspec_srv0.protocol.domain = AF_INET;
+ inet_len = get_addrlen(&self->unspec_srv0, true);
+ self->unspec_srv0.protocol.domain = AF_INET6;
+ inet6_len = get_addrlen(&self->unspec_srv0, true);
+ self->unspec_srv0.protocol.domain = AF_UNIX;
+ unix_len = get_addrlen(&self->unspec_srv0, true);
+ self->unspec_srv0.protocol.domain = AF_UNSPEC;
+
+ /* Checks bind with AF_UNSPEC and less than IPv4 sockaddr length. */
+ bind_fd = socket_variant(&self->srv0);
+ ASSERT_LE(0, bind_fd);
+ ret = bind_variant_addrlen(bind_fd, &self->unspec_srv0, inet_len - 1);
+ EXPECT_EQ(-EINVAL, ret);
+ EXPECT_EQ(0, close(bind_fd));
+
+ /* Checks bind with AF_UNSPEC and IPv6 sockaddr length. */
+ bind_fd = socket_variant(&self->srv0);
+ ASSERT_LE(0, bind_fd);
+ ret = bind_variant_addrlen(bind_fd, &self->unspec_srv0, inet6_len);
+ if (variant->prot.domain == AF_INET ||
+ variant->prot.domain == AF_INET6) {
+ EXPECT_EQ(-EAFNOSUPPORT, ret);
+ } else {
+ EXPECT_EQ(-EINVAL, ret);
+ }
+ EXPECT_EQ(0, close(bind_fd));
+
+ /* Checks bind with AF_UNSPEC and unix sockaddr length. */
+ bind_fd = socket_variant(&self->srv0);
+ ASSERT_LE(0, bind_fd);
+ ret = bind_variant_addrlen(bind_fd, &self->unspec_srv0, unix_len);
+ EXPECT_EQ(-EINVAL, ret);
+ EXPECT_EQ(0, close(bind_fd));
}
TEST_F(protocol, connect_unspec)
--
2.44.0
next prev parent reply other threads:[~2024-03-27 12:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 12:00 [PATCH v1 1/2] lsm: Check and handle error priority for socket_bind and socket_connect Mickaël Salaün
2024-03-27 12:00 ` Mickaël Salaün [this message]
2024-03-27 16:41 ` Casey Schaufler
2024-03-28 15:10 ` Ivanov Mikhail
2024-03-29 20:07 ` Paul Moore
2024-03-29 21:17 ` Paul Moore
2024-03-29 21:17 ` Paul Moore
2024-03-29 21:17 ` Paul Moore
2024-03-29 21:34 ` Paul Moore
2024-03-29 21:34 ` Paul Moore
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=20240327120036.233641-2-mic@digikod.net \
--to=mic@digikod.net \
--cc=edumazet@google.com \
--cc=gnoack@google.com \
--cc=ivanov.mikhail1@huawei-partners.com \
--cc=konstantin.meskhidze@huawei.com \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.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 read-only IMAP folder(s) and NNTP newsgroup(s).