nvme-auth: update sc_c in host response
Subsystems (2)
PATCH 1/1 nvme-auth: update sc_c in host response
The sc_c field is currently not updated in the host response to the controller challenge leading to failures while attempting secure channel concatenation. Fix this by adding a new sc_c variable to the dhchap queue context structure which is appropriately set during negotiate and then used in the host response.
--- drivers/nvme/host/auth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/nvme/host/auth.c +5 -1
@@ -36,6 +36,7 @@ struct nvme_dhchap_queue_context {u8 status;u8 dhgroup_id;u8 hash_id; +u8 sc_c;size_t hash_len;u8 c1[64 ];u8 c2[64 ];
@@ -154,6 +155,8 @@ static int nvme_auth_set_dhchap_negotiate_data(struct nvme_ctrl *ctrl, data->auth_protocol[0 ].dhchap.idlist[34 ] =NVME_AUTH_DHGROUP_6144 ; data->auth_protocol[0 ].dhchap.idlist[35 ] =NVME_AUTH_DHGROUP_8192 ; + chap->sc_c = data->sc_c; +return size; }
@@ -488,7 +491,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, ret =crypto_shash_update (shash, buf,2 );if (ret) goto out; -memset (buf,0 ,sizeof (buf)); +memset (buf, chap->sc_c,sizeof (buf)); ret =crypto_shash_update (shash, buf,1 );if (ret) goto out;
@@ -499,6 +502,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, strlen(ctrl->opts->host->nqn));if (ret) goto out; +memset (buf,0 ,sizeof (buf)); ret =crypto_shash_update (shash, buf,1 );if (ret) goto out;
Signature · 1 line
2.43.0
Hannes Reinecke
maintainerQuoted 35 lines · Martin George
The
sc_cfield is currently not updated in the host response to the controller challenge leading to failures while attempting secure channel concatenation. Fix this by adding a newsc_cvariable to the dhchap queue context structure which is appropriately set during negotiate and then used in the host response.Fixes e88a7595b57f ("nvme-tcp: request secure channel concatenation")Signed-off-by Martin George <[email protected]>Signed-off-by Prashanth Adurthi <[email protected]>--- drivers/nvme/host/auth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/nvme/host/auth.c +3
-0@@ -36,6 +36,7 @@ struct nvme_dhchap_queue_context {u8 status;u8 dhgroup_id;u8 hash_id; +u8 sc_c;size_t hash_len;u8 c1[64 ];u8 c2[64 ];@@ -154,6 +155,8 @@ static int nvme_auth_set_dhchap_negotiate_data(struct nvme_ctrl *ctrl, data->auth_protocol[0 ].dhchap.idlist[34 ] =NVME_AUTH_DHGROUP_6144 ; data->auth_protocol[0 ].dhchap.idlist[35 ] =NVME_AUTH_DHGROUP_8192 ; + chap->sc_c = data->sc_c; +return size; }
drivers/nvme/host/auth.c static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, · line 494
Quoted 5 lines
drivers/nvme/host/auth.c +1
-1@@ -488,7 +491,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, ret =crypto_shash_update (shash, buf,2 );if (ret) goto out; -memset (buf,0 ,sizeof (buf)); +memset (buf, chap->sc_c,sizeof (buf));
'sc_c' is just a single byte, please do
*buf = chap->sc_c;
Otherwise both bytes in 'buf' are being set to 'sc_c'.
drivers/nvme/host/auth.c static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, · line 508
Quoted 11 lines
drivers/nvme/host/auth.c +1
-0ret =crypto_shash_update (shash, buf,1 );if (ret) goto out;@@ -499,6 +502,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, strlen(ctrl->opts->host->nqn));if (ret) goto out; +memset (buf,0 ,sizeof (buf)); ret =crypto_shash_update (shash, buf,1 );if (ret) goto out;
Otherwise looks good.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
Quoted 50 lines · Hannes Reinecke
Quoted 40 lines · Martin George
The
sc_cfield is currently not updated in the host response to the controller challenge leading to failures while attempting secure channel concatenation. Fix this by adding a newsc_cvariable to the
dhchap queue context structure which is appropriately set during negotiate and then used in the host response.Fixes e88a7595b57f ("nvme-tcp: request secure channelconcatenation")
Signed-off-by Martin George <[email protected]>Signed-off-by Prashanth Adurthi <[email protected]>---
drivers/nvme/host/auth.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)drivers/nvme/host/auth.c +1
-0@@ -36,6 +36,7 @@ struct nvme_dhchap_queue_context { u8 status; u8 dhgroup_id; u8 hash_id; +u8 sc_c; size_t hash_len; u8 c1[64]; u8 c2[64];@@ -154,6 +155,8 @@ static int nvme_auth_set_dhchap_negotiate_data(struct nvme_ctrl *ctrl,data->auth_protocol[0].dhchap.idlist[34] =
NVME_AUTH_DHGROUP_6144; data->auth_protocol[0].dhchap.idlist[35] =NVME_AUTH_DHGROUP_8192;drivers/nvme/host/auth.c +2
-0+ chap->sc_c = data->sc_c; +return size;
}drivers/nvme/host/auth.c static int · line 495
Quoted 6 lines
drivers/nvme/host/auth.c +1
-1@@ -488,7 +491,7 @@ static int nvme_auth_dhchap_setup_host_response(struct nvme_ctrl *ctrl, ret = crypto_shash_update(shash, buf, 2); if (ret) goto out; -memset (buf,0 ,sizeof (buf)); +memset (buf, chap->sc_c,sizeof (buf));'
sc_c' is just a single byte, please do
Quoted 4 lines
*buf =
chap->sc_c;Otherwise both bytes in 'buf' are being set to '
sc_c'.
Sure, will send a v2 of the patch with this change. Thanks.
-Martin