[PATCH] nvmet: use appropriate types for authentication payload lengths

[PATCH] nvmet: use appropriate types for authentication payload lengths

[Sreeraj S Kurup]

The authentication payload length is obtained as a u32 value from the
NVMe command, but nvmet_auth_challenge() and nvmet_auth_success1()
accept it as a signed int.

Use u32 for the payload length parameters in both functions to keep
their types consistent with the value returned by
nvmet_auth_receive_data_len() and avoid an unnecessary conversion
from unsigned to signed.

Also, use size_t for data_size in nvmet_auth_challenge(), since the
calculation includes sizeof(), which returns size_t. This avoids
implicitly narrowing the calculated payload size to int.

These changes make the payload length handling consistent with the
underlying types and avoid potential signedness and narrowing issues.

Signed-off-by: Sreeraj S Kurup <sreekuttan2156239@gmail.com>
---
 drivers/nvme/target/fabrics-cmd-auth.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index 70136f6c22e8..99caad6fb87f 100644
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -448,13 +448,13 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
 	nvmet_req_complete(req, status);
 }
 
-static int nvmet_auth_challenge(struct nvmet_req *req, void *d, int al)
+static int nvmet_auth_challenge(struct nvmet_req *req, void *d, u32 al)
 {
 	struct nvmf_auth_dhchap_challenge_data *data = d;
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
 	int ret = 0;
 	int hash_len = nvme_auth_hmac_hash_len(ctrl->shash_id);
-	int data_size = sizeof(*data) + hash_len;
+	size_t data_size = sizeof(*data) + hash_len;
 
 	if (ctrl->dh_tfm)
 		data_size += ctrl->dh_keysize;
@@ -488,7 +488,7 @@ static int nvmet_auth_challenge(struct nvmet_req *req, void *d, int al)
 	return ret;
 }
 
-static int nvmet_auth_success1(struct nvmet_req *req, void *d, int al)
+static int nvmet_auth_success1(struct nvmet_req *req, void *d, u32 al)
 {
 	struct nvmf_auth_dhchap_success1_data *data = d;
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
-- 
2.55.0

Re: [PATCH] nvmet: use appropriate types for authentication payload lengths

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] nvmet: format specifier mismatch in nvmet_auth_challenge()
--

commit 53d4c9b2a209bbb82f1d82e67292975434b27d23
Author: Sreeraj S Kurup <sreekuttan2156239@gmail.com>

nvmet: use appropriate types for authentication payload lengths

This commit changes the payload length parameter al in nvmet_auth_challenge()
and nvmet_auth_success1() from int to u32, and changes data_size in
nvmet_auth_challenge() from int to size_t.

> diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
> index 70136f6c22e8c..99caad6fb87fb 100644
> --- a/drivers/nvme/target/fabrics-cmd-auth.c
> +++ b/drivers/nvme/target/fabrics-cmd-auth.c
> @@ -448,13 +448,13 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
>  	nvmet_req_complete(req, status);
>  }
>  
> -static int nvmet_auth_challenge(struct nvmet_req *req, void *d, int al)
> +static int nvmet_auth_challenge(struct nvmet_req *req, void *d, u32 al)
>  {
>  	struct nvmf_auth_dhchap_challenge_data *data = d;
>  	struct nvmet_ctrl *ctrl = req->sq->ctrl;
>  	int ret = 0;
>  	int hash_len = nvme_auth_hmac_hash_len(ctrl->shash_id);
> -	int data_size = sizeof(*data) + hash_len;
> +	size_t data_size = sizeof(*data) + hash_len;
>  
>  	if (ctrl->dh_tfm)
>  		data_size += ctrl->dh_keysize;

[Severity: Low]
Now that al is u32 and data_size is size_t in nvmet_auth_challenge(), does the
pr_debug() immediately below also need its format specifiers updated from %d
to %u and %zu to avoid a -Wformat warning on 64-bit builds?

	if (al < data_size) {
		pr_debug("%s: buffer too small (al %d need %d)\n", __func__,
			 al, data_size);
		return -EINVAL;
	}

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261031075932.4345-1-sreekuttan2156239@gmail.com?part=1

[PATCH v2] nvmet: use appropriate types for authentication payload lengths

[Sreeraj S Kurup]

The authentication payload length is obtained as a u32 value from the
NVMe command, but nvmet_auth_challenge() and nvmet_auth_success1()
accept it as a signed int.

Use u32 for the payload length parameters in both functions to keep
their types consistent with the value returned by
nvmet_auth_receive_data_len() and avoid an unnecessary conversion
from unsigned to signed.

Also, use size_t for data_size in nvmet_auth_challenge(), since the
calculation includes sizeof(), which returns size_t. This avoids
implicitly narrowing the calculated payload size to int.

These changes make the payload length handling consistent with the
underlying types and avoid potential signedness and narrowing issues.

Signed-off-by: Sreeraj S Kurup <sreekuttan2156239@gmail.com>
---
v2:
 - Update the debug format specifiers in "nvmet_auth_challenge()" to match the 
   updated parameter types. Use "%u" for the "u32" payload length and "%zu" for 
   the "size_t" data size to avoid format type mismatches and ensure correct debug output.

 drivers/nvme/target/fabrics-cmd-auth.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index 70136f6c22e8..c90917d26c98 100644
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -448,18 +448,18 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
 	nvmet_req_complete(req, status);
 }
 
-static int nvmet_auth_challenge(struct nvmet_req *req, void *d, int al)
+static int nvmet_auth_challenge(struct nvmet_req *req, void *d, u32 al)
 {
 	struct nvmf_auth_dhchap_challenge_data *data = d;
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
 	int ret = 0;
 	int hash_len = nvme_auth_hmac_hash_len(ctrl->shash_id);
-	int data_size = sizeof(*data) + hash_len;
+	size_t data_size = sizeof(*data) + hash_len;
 
 	if (ctrl->dh_tfm)
 		data_size += ctrl->dh_keysize;
 	if (al < data_size) {
-		pr_debug("%s: buffer too small (al %d need %d)\n", __func__,
+		pr_debug("%s: buffer too small (al %u need %zu)\n", __func__,
 			 al, data_size);
 		return -EINVAL;
 	}
@@ -488,7 +488,7 @@ static int nvmet_auth_challenge(struct nvmet_req *req, void *d, int al)
 	return ret;
 }
 
-static int nvmet_auth_success1(struct nvmet_req *req, void *d, int al)
+static int nvmet_auth_success1(struct nvmet_req *req, void *d, u32 al)
 {
 	struct nvmf_auth_dhchap_success1_data *data = d;
 	struct nvmet_ctrl *ctrl = req->sq->ctrl;
-- 
2.55.0