diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-07-28 05:49:38 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-28 06:11:48 +0300 |
commit | bb85e12f8fce8f31f661cd904ede8ecf9ce843d6 (patch) | |
tree | 819a0f93300fe3106682cb6e1f48a18d0a18721e /tools | |
parent | 994650353cae9e10cca7fd61de79c911aa8ed287 (diff) | |
parent | 662fbcec32f4af6bdcf5b4006b792ebe9543d945 (diff) | |
download | linux-bb85e12f8fce8f31f661cd904ede8ecf9ce843d6.tar.xz |
Merge branch 'net-tls-fixes-for-nvme-over-tls'
Hannes Reinecke says:
====================
net/tls: fixes for NVMe-over-TLS
here are some small fixes to get NVMe-over-TLS up and running.
The first set are just minor modifications to have MSG_EOR handled
for TLS, but the second set implements the ->read_sock() callback
for tls_sw.
The ->read_sock() callbacks return -EIO when encountering any TLS
Alert message, but as that's the default behaviour anyway I guess
we can get away with it.
====================
Applied on top of the tag in case Sagi gets convinced to pull it.
Link: https://lore.kernel.org/r/20230726191556.41714-1-hare@suse.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/net/tls.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index a3c57004344c..4b63708c6a81 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -486,6 +486,17 @@ TEST_F(tls, msg_more_unsent) EXPECT_EQ(recv(self->cfd, buf, send_len, MSG_DONTWAIT), -1); } +TEST_F(tls, msg_eor) +{ + char const *test_str = "test_read"; + int send_len = 10; + char buf[10]; + + EXPECT_EQ(send(self->fd, test_str, send_len, MSG_EOR), send_len); + EXPECT_EQ(recv(self->cfd, buf, send_len, MSG_WAITALL), send_len); + EXPECT_EQ(memcmp(buf, test_str, send_len), 0); +} + TEST_F(tls, sendmsg_single) { struct msghdr msg; |