nvme-auth: use chap->s2 to indicate bidirectional authentication
Subsystems (2)
PATCH 1/1 nvme-auth: use chap->s2 to indicate bidirectional authentication
From: Martin Wilck <[email protected]>
Commit 546dea18c999 ("nvme-auth: check chap ctrl_key once constructed") replaced the condition "if (ctrl->ctrl_key)" (indicating bidirectional auth) by "if (chap->ctrl_key)", because ctrl->ctrl_key is a resource shared with sysfs. But chap->ctrl_key is set in nvme_auth_process_dhchap_challenge() depending on the DHVLEN in the DH-HMAC-CHAP Challenge message received from the controller, and will thus be non-NULL for every DH-HMAC-CHAP exchange, even if unidirectional auth was requested. This will lead to a protocol violation by sending a Success2 message in the unidirectional case (per NVMe base spec 2.0, the authentication transaction ends after the Success1 message for unidirectional auth). Use chap->s2 instead, which is non-zero if and only if the host requested bi-directional authentication from the controller.
--- drivers/nvme/host/auth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/auth.c +2 -2
@@ -341,7 +341,7 @@ static int nvme_auth_process_dhchap_success1(struct nvme_ctrl *ctrl,struct nvmf_auth_dhchap_success1_data *data = chap->buf;size_t size =sizeof (*data); -if (chap->ctrl_key) +if (chap->s2) size += chap->hash_len;if (size >CHAP_BUF_SIZE ) {
@@ -825,7 +825,7 @@ static void nvme_queue_auth_work(struct work_struct *work) goto fail2; } -if (chap->ctrl_key) { +if (chap->s2) {/* DH-HMAC-CHAP Step 5: send success2 */ dev_dbg (ctrl->device,"%s: qid %d send success2\n" , __func__, chap->qid);
Signature · 1 line
2.42.0
Looks good:
Quoted 15 lines · On 9/4/23 17:26, [email protected] wrote:
From: Martin Wilck <[email protected]>
Commit
546dea18c999("nvme-auth: check chapctrl_keyonce constructed") replaced the condition "if (ctrl->ctrl_key)" (indicating bidirectional auth) by "if (chap->ctrl_key)", becausectrl->ctrl_keyis a resource shared with sysfs. Butchap->ctrl_keyis set innvme_auth_process_dhchap_challenge()depending on the DHVLEN in the DH-HMAC-CHAP Challenge message received from the controller, and will thus be non-NULL for every DH-HMAC-CHAP exchange, even if unidirectional auth was requested. This will lead to a protocol violation by sending a Success2 message in the unidirectional case (per NVMe base spec 2.0, the authentication transaction ends after the Success1 message for unidirectional auth). Usechap->s2instead, which is non-zero if and only if the host requested bi-directional authentication from the controller.
Quoted 6 lines
Fixes 546dea18c999 ("nvme-auth: check chap ctrl_key once constructed")Signed-off-by Martin Wilck <[email protected]>--- drivers/nvme/host/auth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
Quoted 15 lines · On Mon, Sep 04, 2023 at 05:26:38PM +0200, [email protected] wrote:
From: Martin Wilck <[email protected]>
Commit
546dea18c999("nvme-auth: check chapctrl_keyonce constructed") replaced the condition "if (ctrl->ctrl_key)" (indicating bidirectional auth) by "if (chap->ctrl_key)", becausectrl->ctrl_keyis a resource shared with sysfs. Butchap->ctrl_keyis set innvme_auth_process_dhchap_challenge()depending on the DHVLEN in the DH-HMAC-CHAP Challenge message received from the controller, and will thus be non-NULL for every DH-HMAC-CHAP exchange, even if unidirectional auth was requested. This will lead to a protocol violation by sending a Success2 message in the unidirectional case (per NVMe base spec 2.0, the authentication transaction ends after the Success1 message for unidirectional auth). Usechap->s2instead, which is non-zero if and only if the host requested bi-directional authentication from the controller.
Quoted 2 lines
Fixes 546dea18c999 ("nvme-auth: check chap ctrl_key once constructed")Signed-off-by Martin Wilck <[email protected]>
Any chance to get this applied?
Thanks!
Daniel
Keith Busch
maintainerQuoted 1 line · Daniel Wagner
Any chance to get this applied?
Applied for nvme-6.6 now, thank you for the ping!