From: Hannes Reinecke <hare@suse.de>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org,
Chuck Lever <chuck.lever@oracle.com>,
kernel-tls-handshake@lists.linux.dev,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 12/18] nvme-tcp: control message handling for recvmsg()
Date: Mon, 17 Apr 2023 15:02:56 +0200 [thread overview]
Message-ID: <20230417130302.86274-13-hare@suse.de> (raw)
In-Reply-To: <20230417130302.86274-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 | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index b80bcc5fe447..eeb3f85fe259 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1352,6 +1352,11 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue)
{
struct nvme_tcp_icreq_pdu *icreq;
struct nvme_tcp_icresp_pdu *icresp;
+#ifdef CONFIG_NVME_TCP_TLS
+ char cbuf[CMSG_LEN(sizeof(char))] = {};
+ struct cmsghdr *cmsg;
+ unsigned char ctype;
+#endif
struct msghdr msg = {};
struct kvec iov;
bool ctrl_hdgst, ctrl_ddgst;
@@ -1389,11 +1394,27 @@ 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);
+#ifdef CONFIG_NVME_TCP_TLS
+ msg.msg_control = cbuf;
+ msg.msg_controllen = sizeof(cbuf);
+#endif
ret = kernel_recvmsg(queue->sock, &msg, &iov, 1,
iov.iov_len, msg.msg_flags);
if (ret < 0)
goto free_icresp;
-
+#ifdef CONFIG_NVME_TCP_TLS
+ cmsg = (struct cmsghdr *)cbuf;
+ if (CMSG_OK(&msg, cmsg) &&
+ cmsg->cmsg_level == SOL_TLS &&
+ cmsg->cmsg_type == TLS_GET_RECORD_TYPE) {
+ ctype = *((unsigned char *)CMSG_DATA(cmsg));
+ if (ctype != TLS_RECORD_TYPE_DATA) {
+ pr_err("queue %d: unhandled TLS record %d\n",
+ nvme_tcp_queue_id(queue), ctype);
+ return -ENOTCONN;
+ }
+ }
+#endif
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-04-17 13:03 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 13:02 [PATCHv3 00/18] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-04-17 13:02 ` [PATCH 01/18] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-04-17 13:02 ` [PATCH 02/18] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-04-17 13:02 ` [PATCH 03/18] nvme: add TCP TSAS definitions Hannes Reinecke
2023-04-17 13:02 ` [PATCH 04/18] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-04-17 13:02 ` [PATCH 05/18] nvme-keyring: implement nvme_tls_psk_default() Hannes Reinecke
2023-04-17 13:02 ` [PATCH 06/18] net/tls: implement ->read_sock() Hannes Reinecke
2023-04-17 15:14 ` Sagi Grimberg
2023-04-17 13:02 ` [PATCH 07/18] net/tls: sanitize MSG_EOR handling Hannes Reinecke
2023-04-17 15:19 ` Sagi Grimberg
2023-04-17 20:10 ` Jakub Kicinski
2023-04-18 10:07 ` Sagi Grimberg
2023-04-18 10:24 ` Hannes Reinecke
2023-04-18 10:39 ` Hannes Reinecke
2023-04-18 10:43 ` Sagi Grimberg
2023-04-18 11:02 ` Hannes Reinecke
2023-04-18 18:28 ` Jakub Kicinski
2023-04-17 13:02 ` [PATCH 08/18] nvme-tcp: do not set MSG_SENDPAGE_NOTLAST Hannes Reinecke
2023-04-17 15:10 ` Sagi Grimberg
2023-04-17 15:25 ` Hannes Reinecke
2023-04-17 15:28 ` Sagi Grimberg
2023-04-17 15:35 ` Hannes Reinecke
2023-04-17 20:16 ` Jakub Kicinski
2023-04-18 10:33 ` Hannes Reinecke
2023-04-18 18:21 ` Jakub Kicinski
2023-04-18 18:25 ` Hannes Reinecke
2023-04-17 13:02 ` [PATCH 09/18] security/keys: export key_lookup() Hannes Reinecke
2023-04-17 13:02 ` [PATCH 10/18] nvme/tcp: allocate socket file Hannes Reinecke
2023-04-17 13:02 ` [PATCH 11/18] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-04-17 15:26 ` Sagi Grimberg
2023-04-17 15:28 ` Hannes Reinecke
2023-04-17 15:31 ` Sagi Grimberg
2023-04-17 15:36 ` Hannes Reinecke
2023-04-18 5:52 ` Daniel Wagner
2023-04-18 9:38 ` Hannes Reinecke
2023-04-18 10:12 ` Sagi Grimberg
2023-04-18 10:28 ` Hannes Reinecke
2023-04-18 10:32 ` Sagi Grimberg
2023-04-18 10:33 ` Hannes Reinecke
2023-04-17 13:02 ` Hannes Reinecke [this message]
2023-04-17 15:24 ` [PATCH 12/18] nvme-tcp: control message handling for recvmsg() Sagi Grimberg
2023-04-17 15:26 ` Hannes Reinecke
2023-04-17 13:02 ` [PATCH 13/18] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-04-17 13:02 ` [PATCH 14/18] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-04-17 13:02 ` [PATCH 15/18] nvmet-tcp: allocate socket file Hannes Reinecke
2023-04-17 15:29 ` Sagi Grimberg
2023-04-17 13:03 ` [PATCH 16/18] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-04-17 13:03 ` [PATCH 17/18] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
2023-04-17 13:03 ` [PATCH 18/18] nvmet-tcp: add configfs attribute 'param_keyring' 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=20230417130302.86274-13-hare@suse.de \
--to=hare@suse.de \
--cc=chuck.lever@oracle.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kernel-tls-handshake@lists.linux.dev \
--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;
as well as URLs for NNTP newsgroup(s).