[PATCH 0/2] nvmet: type missmatch fixes for nvmet-auth

[PATCH 0/2] nvmet: type missmatch fixes for nvmet-auth

[Chaitanya Kulkarni]

Hi,

Couple of type mismatch fixes for nvmet-auth reported by
Dan Carpenter.

-ck

Chaitanya Kulkarni (2):
  nvmet: fix return value check in auth send
  nvmet: fix return value check in auth receive

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

-- 
2.29.0

[PATCH 1/2] nvmet: fix return value check in auth send

[Chaitanya Kulkarni]

nvmet_setup_auth() return type is int and currently it uses status
variable that is of type u16 in nvmet_execute_auth_send().

Catch the return value of nvmet_setup_auth() into int and set the
NVME_SC_INTERNAL as status variable before we jump to error.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
 drivers/nvme/target/fabrics-cmd-auth.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index cc56e8c821ce..f1c9c2f51afb 100644
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -247,8 +247,10 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
 			pr_debug("%s: ctrl %d qid %d reset negotiation\n", __func__,
 				 ctrl->cntlid, req->sq->qid);
 			if (!req->sq->qid) {
-				status = nvmet_setup_auth(ctrl);
-				if (status < 0) {
+				int ret = nvmet_setup_auth(ctrl);
+
+				if (ret < 0) {
+					status = NVME_SC_INTERNAL;
 					pr_err("ctrl %d qid 0 failed to setup"
 					       "re-authentication",
 					       ctrl->cntlid);
-- 
2.29.0

[PATCH 2/2] nvmet: fix return value check in auth receive

[Chaitanya Kulkarni]

nvmet_auth_challenge() return type is int and currently it uses status
variable that is of type u16 in nvmet_execute_auth_receive().

Catch the return value of nvmet_auth_challenge() into int and set the
NVME_SC_INTERNAL as status variable before we jump to error.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
 drivers/nvme/target/fabrics-cmd-auth.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index f1c9c2f51afb..45056e204dde 100644
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -486,8 +486,9 @@ void nvmet_execute_auth_receive(struct nvmet_req *req)
 		 ctrl->cntlid, req->sq->qid, req->sq->dhchap_step);
 	switch (req->sq->dhchap_step) {
 	case NVME_AUTH_DHCHAP_MESSAGE_CHALLENGE:
-		status = nvmet_auth_challenge(req, d, al);
-		if (status < 0) {
+		int ret = nvmet_auth_challenge(req, d, al);
+
+		if (ret < 0) {
 			pr_warn("ctrl %d qid %d: challenge error (%d)\n",
 				ctrl->cntlid, req->sq->qid, status);
 			status = NVME_SC_INTERNAL;
-- 
2.29.0

Re: [PATCH 1/2] nvmet: fix return value check in auth send

[Hannes Reinecke]

On 7/19/22 01:12, Chaitanya Kulkarni wrote:
> nvmet_setup_auth() return type is int and currently it uses status
> variable that is of type u16 in nvmet_execute_auth_send().
> 
> Catch the return value of nvmet_setup_auth() into int and set the
> NVME_SC_INTERNAL as status variable before we jump to error.
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
> ---
>   drivers/nvme/target/fabrics-cmd-auth.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
> index cc56e8c821ce..f1c9c2f51afb 100644
> --- a/drivers/nvme/target/fabrics-cmd-auth.c
> +++ b/drivers/nvme/target/fabrics-cmd-auth.c
> @@ -247,8 +247,10 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
>   			pr_debug("%s: ctrl %d qid %d reset negotiation\n", __func__,
>   				 ctrl->cntlid, req->sq->qid);
>   			if (!req->sq->qid) {
> -				status = nvmet_setup_auth(ctrl);
> -				if (status < 0) {
> +				int ret = nvmet_setup_auth(ctrl);
> +
> +				if (ret < 0) {
> +					status = NVME_SC_INTERNAL;
>   					pr_err("ctrl %d qid 0 failed to setup"
>   					       "re-authentication",
>   					       ctrl->cntlid);

Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes

Re: [PATCH 2/2] nvmet: fix return value check in auth receive

[Hannes Reinecke]

On 7/19/22 01:12, Chaitanya Kulkarni wrote:
> nvmet_auth_challenge() return type is int and currently it uses status
> variable that is of type u16 in nvmet_execute_auth_receive().
> 
> Catch the return value of nvmet_auth_challenge() into int and set the
> NVME_SC_INTERNAL as status variable before we jump to error.
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
> ---
>   drivers/nvme/target/fabrics-cmd-auth.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
> index f1c9c2f51afb..45056e204dde 100644
> --- a/drivers/nvme/target/fabrics-cmd-auth.c
> +++ b/drivers/nvme/target/fabrics-cmd-auth.c
> @@ -486,8 +486,9 @@ void nvmet_execute_auth_receive(struct nvmet_req *req)
>   		 ctrl->cntlid, req->sq->qid, req->sq->dhchap_step);
>   	switch (req->sq->dhchap_step) {
>   	case NVME_AUTH_DHCHAP_MESSAGE_CHALLENGE:
> -		status = nvmet_auth_challenge(req, d, al);
> -		if (status < 0) {
> +		int ret = nvmet_auth_challenge(req, d, al);
> +
> +		if (ret < 0) {
>   			pr_warn("ctrl %d qid %d: challenge error (%d)\n",
>   				ctrl->cntlid, req->sq->qid, status);
>   			status = NVME_SC_INTERNAL;

Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes

Re: [PATCH 1/2] nvmet: fix return value check in auth send

[Christoph Hellwig]

Thanks, both patches applied to nvme-5.20.

Re: [PATCH 0/2] nvmet: type missmatch fixes for nvmet-auth

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>