From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 09/16] nvme-tcp: control message handling for recvmsg()
Date: Tue, 8 Aug 2023 18:53:47 +0200 [thread overview]
Message-ID: <20230808165354.123499-10-hare@suse.de> (raw)
In-Reply-To: <20230808165354.123499-1-hare@suse.de>
kTLS is sending TLS ALERT messages as control messages for recvmsg().
As we can't do anything sensible with it just abort the connection
and let the userspace agent to a re-negotiation.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/tcp.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index d444119c408b..3382e85b7759 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -14,6 +14,7 @@
#include <net/sock.h>
#include <net/tcp.h>
#include <net/tls.h>
+#include <net/tls_prot.h>
#include <net/handshake.h>
#include <linux/blk-mq.h>
#include <crypto/hash.h>
@@ -1369,6 +1370,8 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue)
{
struct nvme_tcp_icreq_pdu *icreq;
struct nvme_tcp_icresp_pdu *icresp;
+ char cbuf[CMSG_LEN(sizeof(char))] = {};
+ u8 ctype;
struct msghdr msg = {};
struct kvec iov;
bool ctrl_hdgst, ctrl_ddgst;
@@ -1406,11 +1409,23 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue)
memset(&msg, 0, sizeof(msg));
iov.iov_base = icresp;
iov.iov_len = sizeof(*icresp);
+ if (queue->ctrl->ctrl.opts->tls) {
+ msg.msg_control = cbuf;
+ msg.msg_controllen = sizeof(cbuf);
+ }
ret = kernel_recvmsg(queue->sock, &msg, &iov, 1,
iov.iov_len, msg.msg_flags);
if (ret < 0)
goto free_icresp;
-
+ if (queue->ctrl->ctrl.opts->tls) {
+ ctype = tls_get_record_type(queue->sock->sk,
+ (struct cmsghdr *)cbuf);
+ if (ctype != TLS_RECORD_TYPE_DATA) {
+ pr_err("queue %d: unhandled TLS record %d\n",
+ nvme_tcp_queue_id(queue), ctype);
+ return -ENOTCONN;
+ }
+ }
ret = -EINVAL;
if (icresp->hdr.type != nvme_tcp_icresp) {
pr_err("queue %d: bad type returned %d\n",
--
2.35.3
next prev parent reply other threads:[~2023-08-08 16:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 16:53 [PATCHv6 00/16] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-08-08 16:53 ` [PATCH 01/16] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-08-08 16:53 ` [PATCH 02/16] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-08-08 16:53 ` [PATCH 03/16] nvme: add TCP TSAS definitions Hannes Reinecke
2023-08-08 16:53 ` [PATCH 04/16] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-08-08 16:53 ` [PATCH 05/16] nvme-keyring: implement nvme_tls_psk_default() Hannes Reinecke
2023-08-08 16:53 ` [PATCH 06/16] security/keys: export key_lookup() Hannes Reinecke
2023-08-10 13:41 ` David Howells
2023-08-08 16:53 ` [PATCH 07/16] nvme-tcp: allocate socket file Hannes Reinecke
2023-08-08 16:53 ` [PATCH 08/16] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-09 9:47 ` Sagi Grimberg
2023-08-09 10:00 ` Hannes Reinecke
2023-08-08 16:53 ` Hannes Reinecke [this message]
2023-08-08 16:53 ` [PATCH 10/16] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-08-09 9:56 ` Sagi Grimberg
2023-08-09 10:02 ` Hannes Reinecke
2023-08-08 16:53 ` [PATCH 11/16] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-08-08 16:53 ` [PATCH 12/16] nvmet-tcp: make nvmet_tcp_alloc_queue() a void function Hannes Reinecke
2023-08-09 10:26 ` Sagi Grimberg
2023-08-08 16:53 ` [PATCH 13/16] nvmet-tcp: allocate socket file Hannes Reinecke
2023-08-09 10:28 ` Sagi Grimberg
2023-08-08 16:53 ` [PATCH 14/16] nvmet: Allow to change 'TSAS' and 'TREQ' Hannes Reinecke
2023-08-09 10:44 ` Sagi Grimberg
2023-08-09 11:18 ` Hannes Reinecke
2023-08-08 16:53 ` [PATCH 15/16] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-09 10:51 ` Sagi Grimberg
2023-08-09 11:33 ` Hannes Reinecke
2023-08-09 12:51 ` Sagi Grimberg
2023-08-09 12:54 ` Sagi Grimberg
2023-08-09 13:24 ` Hannes Reinecke
2023-08-09 13:22 ` Hannes Reinecke
2023-08-10 7:09 ` Hannes Reinecke
2023-08-10 8:04 ` Sagi Grimberg
2023-08-08 16:53 ` [PATCH 16/16] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
2023-08-09 11:30 ` Sagi Grimberg
2023-08-09 11:35 ` Hannes Reinecke
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=20230808165354.123499-10-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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