All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@kernel.org>
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@kernel.org>
Subject: [PATCH 5/8] nvme-sysfs: add 'tls_configured_key' sysfs attribute
Date: Thu, 18 Jul 2024 16:48:55 +0200	[thread overview]
Message-ID: <20240718144858.19074-6-hare@kernel.org> (raw)
In-Reply-To: <20240718144858.19074-1-hare@kernel.org>

There is a difference between the negotiated TLS key (which is
always present for a TLS encrypted connection) and the configured
TLS key (which is specified with the --tls_key command line option).
To differentate between these two add a new sysfs attribute
'tls_configured_key' to hold the specified on the command line.

Signed-off-by: Hannes Reinecke <hare@kernel.org>
---
 drivers/nvme/host/sysfs.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c
index c391ad6c5a88..62f03aa530c8 100644
--- a/drivers/nvme/host/sysfs.c
+++ b/drivers/nvme/host/sysfs.c
@@ -675,6 +675,16 @@ static ssize_t tls_key_show(struct device *dev,
 	return sysfs_emit(buf, "%08x\n", ctrl->tls_pskid);
 }
 static DEVICE_ATTR_RO(tls_key);
+
+static ssize_t tls_configured_key_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
+	struct key *key = ctrl->opts->tls_key;
+
+	return sysfs_emit(buf, "%08x\n", key_serial(key));
+}
+static DEVICE_ATTR_RO(tls_configured_key);
 #endif
 
 static struct attribute *nvme_dev_attrs[] = {
@@ -706,6 +716,7 @@ static struct attribute *nvme_dev_attrs[] = {
 #endif
 #ifdef CONFIG_NVME_TCP_TLS
 	&dev_attr_tls_key.attr,
+	&dev_attr_tls_configured_key.attr,
 #endif
 	&dev_attr_adm_passthru_err_log_enabled.attr,
 	NULL
@@ -741,6 +752,10 @@ static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj,
 	if (a == &dev_attr_tls_key.attr &&
 	    (!ctrl->opts || strcmp(ctrl->opts->transport, "tcp")))
 		return 0;
+	if (a == &dev_attr_tls_configured_key.attr &&
+	    (!ctrl->opts || !ctrl->opts->tls_key ||
+	     strcmp(ctrl->opts->transport, "tcp")))
+		return 0;
 #endif
 
 	return a->mode;
-- 
2.35.3



  parent reply	other threads:[~2024-07-18 14:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-18 14:48 [PATCHv6 0/8] nvme: fixes for secure concatenation Hannes Reinecke
2024-07-18 14:48 ` [PATCH 1/8] nvme-keyring: restrict match length for version '1' identifiers Hannes Reinecke
2024-07-19  5:34   ` Christoph Hellwig
2024-07-19  6:16     ` Hannes Reinecke
2024-07-18 14:48 ` [PATCH 2/8] nvme-tcp: sanitize TLS key handling Hannes Reinecke
2024-07-19  5:35   ` Christoph Hellwig
2024-07-18 14:48 ` [PATCH 3/8] nvme-tcp: check for invalidated or revoked key Hannes Reinecke
2024-07-19  5:37   ` Christoph Hellwig
2024-07-18 14:48 ` [PATCH 4/8] nvme: add a newline to the 'tls_key' sysfs attribute Hannes Reinecke
2024-07-19  5:37   ` Christoph Hellwig
2024-07-18 14:48 ` Hannes Reinecke [this message]
2024-07-19  5:44   ` [PATCH 5/8] nvme-sysfs: add 'tls_configured_key' " Christoph Hellwig
2024-07-19  6:29     ` Hannes Reinecke
2024-07-18 14:48 ` [PATCH 6/8] nvme-sysfs: add 'tls_keyring' attribute Hannes Reinecke
2024-07-18 14:48 ` [PATCH 7/8] nvmet-auth: allow to clear DH-HMAC-CHAP keys Hannes Reinecke
2024-07-18 14:48 ` [PATCH 8/8] nvme-target: do not check authentication status for admin commands twice Hannes Reinecke
2024-07-19  5:45   ` Christoph Hellwig

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=20240718144858.19074-6-hare@kernel.org \
    --to=hare@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.