nvme-auth: auth success1 msg always includes resp

In cases where RVALID is false, the response is still transmitted,
but is cleared to zero.

Relevant extract from the spec:
Response R2, if valid (i.e., if the RVALID field is set to 01h),
cleared to 0h otherwise

Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index eaefebb2a799a20d6912b5a4a9b17558e418a46f..5885bb0d5a9a69e3f7bf57efc7949ad526f27dea 100644 (file)
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -339,10 +339,7 @@ static int nvme_auth_process_dhchap_success1(struct nvme_ctrl *ctrl,
                struct nvme_dhchap_queue_context *chap)
 {
        struct nvmf_auth_dhchap_success1_data *data = chap->buf;
-       size_t size = sizeof(*data);
-
-       if (chap->s2)
-               size += chap->hash_len;
+       size_t size = sizeof(*data) + chap->hash_len;
 
        if (size > CHAP_BUF_SIZE) {
                chap->status = NVME_AUTH_DHCHAP_FAILURE_INCORRECT_PAYLOAD;

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index a7ba74babad73a5d4d6924cd096e210923b2e5c8..44325c068b6a01eb81274fa65767dd9298d35643 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1732,7 +1732,7 @@ struct nvmf_auth_dhchap_success1_data {
        __u8            rsvd2;
        __u8            rvalid;
        __u8            rsvd3[7];
-       /* 'hl' bytes of response value if 'rvalid' is set */
+       /* 'hl' bytes of response value */
        __u8            rval[];
 };