2018-08-02 08:44:29

by Dan Carpenter

Subject: [PATCH] misc: mic: SCIF Fix scif_get_new_port() error handling

There are only 2 callers of scif_get_new_port() and both appear to get
the error handling wrong. Both treat zero returns as error, but it
actually returns negative error codes and >= 0 on success.

Fixes: e9089f43c9a7 ("misc: mic: SCIF open close bind and listen APIs")
Signed-off-by: Dan Carpenter <[email protected]>
---
I have not tested this patch. Please review carefully.

diff --git a/drivers/misc/mic/scif/scif_api.c b/drivers/misc/mic/scif/scif_api.c
index 463f06d0b4ef..8dd0ccedeb94 100644
--- a/drivers/misc/mic/scif/scif_api.c
+++ b/drivers/misc/mic/scif/scif_api.c
@@ -371,11 +371,10 @@ int scif_bind(scif_epd_t epd, u16 pn)
goto scif_bind_exit;
}
} else {
- pn = scif_get_new_port();
- if (!pn) {
- ret = -ENOSPC;
+ ret = scif_get_new_port();
+ if (ret < 0)
goto scif_bind_exit;
- }
+ pn = ret;
}

ep->state = SCIFEP_BOUND;
@@ -649,13 +648,12 @@ int __scif_connect(scif_epd_t epd, struct scif_port_id *dst, bool non_block)
err = -EISCONN;
break;
case SCIFEP_UNBOUND:
- ep->port.port = scif_get_new_port();
- if (!ep->port.port) {
- err = -ENOSPC;
- } else {
- ep->port.node = scif_info.nodeid;
- ep->conn_async_state = ASYNC_CONN_IDLE;
- }
+ err = scif_get_new_port();
+ if (err < 0)
+ break;
+ ep->port.port = err;
+ ep->port.node = scif_info.nodeid;
+ ep->conn_async_state = ASYNC_CONN_IDLE;
/* Fall through */
case SCIFEP_BOUND:
/*

2018-08-08 23:21:09

by Dutt, Sudeep

Subject: Re: [PATCH] misc: mic: SCIF Fix scif_get_new_port() error handling

On Thu, 2018-08-02 at 01:42 -0700, Dan Carpenter wrote:
> There are only 2 callers of scif_get_new_port() and both appear to get
> the error handling wrong. Both treat zero returns as error, but it
> actually returns negative error codes and >= 0 on success.
>
> Fixes: e9089f43c9a7 ("misc: mic: SCIF open close bind and listen APIs")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> I have not tested this patch. Please review carefully.

Thanks for the patch Dan.

Reviewed-by: Sudeep Dutt <[email protected]>

>
> diff --git a/drivers/misc/mic/scif/scif_api.c b/drivers/misc/mic/scif/scif_api.c
> index 463f06d0b4ef..8dd0ccedeb94 100644
> --- a/drivers/misc/mic/scif/scif_api.c
> +++ b/drivers/misc/mic/scif/scif_api.c
> @@ -371,11 +371,10 @@ int scif_bind(scif_epd_t epd, u16 pn)
> goto scif_bind_exit;
> }
> } else {
> - pn = scif_get_new_port();
> - if (!pn) {
> - ret = -ENOSPC;
> + ret = scif_get_new_port();
> + if (ret < 0)
> goto scif_bind_exit;
> - }
> + pn = ret;
> }
>
> ep->state = SCIFEP_BOUND;
> @@ -649,13 +648,12 @@ int __scif_connect(scif_epd_t epd, struct scif_port_id *dst, bool non_block)
> err = -EISCONN;
> break;
> case SCIFEP_UNBOUND:
> - ep->port.port = scif_get_new_port();
> - if (!ep->port.port) {
> - err = -ENOSPC;
> - } else {
> - ep->port.node = scif_info.nodeid;
> - ep->conn_async_state = ASYNC_CONN_IDLE;
> - }
> + err = scif_get_new_port();
> + if (err < 0)
> + break;
> + ep->port.port = err;
> + ep->port.node = scif_info.nodeid;
> + ep->conn_async_state = ASYNC_CONN_IDLE;
> /* Fall through */
> case SCIFEP_BOUND:
> /*