From: Mark O'Donovan <shiftee@posteo.net>
To: linux-kernel@vger.kernel.org
Cc: linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de,
axboe@kernel.dk, kbusch@kernel.org, hare@suse.de,
Mark O'Donovan <shiftee@posteo.net>,
Akash Appaiah <Akash.Appaiah@dell.com>
Subject: [PATCH 1/2] nvme-auth: use transformed key size to create resp
Date: Fri, 13 Oct 2023 20:28:26 +0000 [thread overview]
Message-ID: <20231013202827.2262708-2-shiftee@posteo.net> (raw)
In-Reply-To: <20231013202827.2262708-1-shiftee@posteo.net>
This does not change current behaviour as the driver currently
verifies that the secret size is the same size as the length of
the transformation hash.
Co-developed-by: Akash Appaiah <Akash.Appaiah@dell.com>
Signed-off-by: Akash Appaiah <Akash.Appaiah@dell.com>
Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
---
drivers/nvme/host/auth.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index daf5d144a8ea..e7d478d17b06 100644
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -418,6 +418,14 @@ static int nvme_auth_set_dhchap_failure2_data(struct nvme_ctrl *ctrl,
return size;
}
+static int nvme_auth_dhchap_transformed_key_len(struct nvme_dhchap_key *key)
+{
+ if (key->hash)
+ return nvme_auth_hmac_hash_len(key->hash);
+
+ return key->len;
+}
+
static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl,
struct nvme_dhchap_queue_context *chap)
{
@@ -442,7 +450,8 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl,
}
ret = crypto_shash_setkey(chap->shash_tfm,
- chap->host_response, ctrl->host_key->len);
+ chap->host_response,
+ nvme_auth_dhchap_transformed_key_len(ctrl->host_key));
if (ret) {
dev_warn(ctrl->device, "qid %d: failed to set key, error %d\n",
chap->qid, ret);
--
2.39.2
next prev parent reply other threads:[~2023-10-13 20:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 20:28 [PATCH 0/2] Remove secret-size restrictions for hashes Mark O'Donovan
2023-10-13 20:28 ` Mark O'Donovan [this message]
2023-10-14 11:41 ` [PATCH 1/2] nvme-auth: use transformed key size to create resp Hannes Reinecke
2023-10-16 8:54 ` Mark O'Donovan
2023-10-13 20:28 ` [PATCH 2/2] nvme-auth: allow mixing of secret and hash lengths Mark O'Donovan
2023-10-14 11:41 ` 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=20231013202827.2262708-2-shiftee@posteo.net \
--to=shiftee@posteo.net \
--cc=Akash.Appaiah@dell.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®