nvme-auth: use chap->s2 to indicate bidirectional authentication
authorMartin Wilck <mwilck@suse.com>
Mon, 4 Sep 2023 15:26:38 +0000 (17:26 +0200)
committerKeith Busch <kbusch@kernel.org>
Tue, 10 Oct 2023 15:06:06 +0000 (08:06 -0700)
commit4ae55a7dce04989f289d5c5c8c8e5c37adc36c71
treee2b748477a682cfdc6b64b6fd5d5777dd39cc804
parentd920abd1e7c4884f9ecd0749d1921b7ab19ddfbd
nvme-auth: use chap->s2 to indicate bidirectional authentication

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.

Fixes: 546dea18c999 ("nvme-auth: check chap ctrl_key once constructed")
Signed-off-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/auth.c