From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE1B9C47258 for ; Tue, 23 Jan 2024 14:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZfzkJApSFva+erVYpopbXEbf/8BmeCaYGaZSQB+l/88=; b=Ns1/TFyFQiDVFWbmX5XKOnZCeP kvIyEbbY6FRPOv48btQW0euxw8/4e/ifoovmcxib8713OPjHiF+Nq2dEeZzOrRFG1VX0b1Q8oOWtH LKKT/J/zP6ch9W4Wp4VI1RUx4UwnKkhdmD2aqUXpIM2m5vWvKQ5S/npigNK7Ygp5z8FvCIFHyMJHz 1CpGvXCL29s+kEz3jUDWGBh4phYfDhvbhdG5PqpfL1O1EkViz5eYqJird/FeFVrX/ad20f9xjg1bU BsI0ZsdDXLEjhDhv8FAUMs0wq6iK7JR3MqUXnxuY91qPi50xCyyeCvzDJCOMGE2qmJ7iytqA7iFNH pTPXTh0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSHdF-00GmI6-0Q; Tue, 23 Jan 2024 14:20:05 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSHdB-00GmGW-2T for linux-nvme@lists.infradead.org; Tue, 23 Jan 2024 14:20:03 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 3BE8A61E0A; Tue, 23 Jan 2024 14:19:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D35AFC43394; Tue, 23 Jan 2024 14:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706019571; bh=xpF84CDuwskauc7Zjru5Yx/Bbr0rCpz6JXbuWzp43C0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gNxslXTSdoqrLRoj0CTC1wxTI+87d32E+PRHPJVKaKIBDl6vFrwiJvBL2+hyj3jHc lYj0mdHnL8AAON8DFGzGGjoxaS/noHc61ojLItX3cC8AoD2BFwkeAWnTZrhAa18q9F IrhKKhGcMpkQbKFozBrpLy144zUbP+U40tlJQWot5GOXfGy5bTWD1i3SMxTt0z0PZY DmHta6HLeg9UUoB+K06vZG0Orp46SF2iqCAt+taGY6tI15V+xJ3x5wYfrnIA4HjTzu Pp/D0XQ4GJyFbYWovY4baX49zKA1v3lLptCJDrc8IUZNj/3cUDqdL+939RzVr2hOFU g56HX+l9Y/z7g== From: hare@kernel.org To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Hannes Reinecke Subject: [PATCH 05/11] nvme-keyring: add nvme_tls_psk_refresh() Date: Tue, 23 Jan 2024 15:19:03 +0100 Message-Id: <20240123141909.79061-6-hare@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240123141909.79061-1-hare@kernel.org> References: <20240123141909.79061-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240123_062001_905533_D9AC971F X-CRM114-Status: GOOD ( 12.62 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Hannes Reinecke Add a function to refresh a generated PSK in the specified keyring. Signed-off-by: Hannes Reinecke --- drivers/nvme/common/keyring.c | 50 +++++++++++++++++++++++++++++++++++ include/linux/nvme-keyring.h | 7 +++++ 2 files changed, 57 insertions(+) diff --git a/drivers/nvme/common/keyring.c b/drivers/nvme/common/keyring.c index a5c0431c101c..c16f9496643f 100644 --- a/drivers/nvme/common/keyring.c +++ b/drivers/nvme/common/keyring.c @@ -104,6 +104,56 @@ static struct key *nvme_tls_psk_lookup(struct key *keyring, return key_ref_to_ptr(keyref); } +struct key *nvme_tls_psk_refresh(struct key *keyring, char *hostnqn, char *subnqn, + u8 hmac_id, bool generated, u8 *data, size_t data_len, char *digest) +{ + key_perm_t keyperm = + KEY_POS_SEARCH | KEY_POS_VIEW | KEY_POS_READ | + KEY_POS_WRITE | KEY_POS_LINK | KEY_POS_SETATTR | + KEY_USR_SEARCH | KEY_USR_VIEW | KEY_USR_READ; + char *identity; + size_t identity_len = (NVMF_NQN_SIZE) * 2 + 77; + key_ref_t keyref; + key_serial_t keyring_id; + struct key *key; + + if (!hostnqn || !subnqn || !data || !data_len) + return ERR_PTR(-EINVAL); + + identity = kzalloc(identity_len, GFP_KERNEL); + if (!identity) + return ERR_PTR(-ENOMEM); + + snprintf(identity, identity_len, "NVMe1%c%02d %s %s %s", + generated ? 'G' : 'R', hmac_id, hostnqn, subnqn, digest); + + if (!keyring) + keyring = nvme_keyring; + keyring_id = key_serial(keyring); + pr_debug("keyring %x refresh tls psk '%s'\n", + keyring_id, identity); + keyref = key_create_or_update(make_key_ref(keyring, true), + "psk", identity, data, data_len, + keyperm, KEY_ALLOC_NOT_IN_QUOTA | + KEY_ALLOC_BUILT_IN | + KEY_ALLOC_BYPASS_RESTRICTION); + if (IS_ERR(keyref)) { + pr_debug("refresh tls psk '%s' failed, error %ld\n", + identity, PTR_ERR(keyref)); + kfree(identity); + return ERR_PTR(-ENOKEY); + } + kfree(identity); + /* + * Set the default timeout to 1 hour + * as suggested in TP8018. + */ + key = key_ref_to_ptr(keyref); + key_set_timeout(key, 3600); + return key; +} +EXPORT_SYMBOL_GPL(nvme_tls_psk_refresh); + /* * NVMe PSK priority list * diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h index e10333d78dbb..d2b8a0783ad7 100644 --- a/include/linux/nvme-keyring.h +++ b/include/linux/nvme-keyring.h @@ -8,6 +8,8 @@ #if IS_ENABLED(CONFIG_NVME_KEYRING) +struct key *nvme_tls_psk_refresh(struct key *keyring, char *hostnqn, char *subnqn, + u8 hmac_id, bool generated, u8 *data, size_t data_len, char *digest); key_serial_t nvme_tls_psk_default(struct key *keyring, const char *hostnqn, const char *subnqn); @@ -15,6 +17,11 @@ key_serial_t nvme_keyring_id(void); #else +static struct key *nvme_tls_psk_refresh(struct key *keyring, char *hostnqn, char *subnqn, + u8 hmac_id, bool generated, u8 *data, size_t data_len, char *digest) +{ + return -ENOTSUPP; +} static inline key_serial_t nvme_tls_psk_default(struct key *keyring, const char *hostnqn, const char *subnqn) { -- 2.35.3