[PATCH AUTOSEL 4.18 003/131] misc: mic: SCIF Fix scif_get_new_port() error handling

[Sasha Levin]

From: Dan Carpenter <dan.carpen...@oracle.com>

[ Upstream commit a39284ae9d2ad09975c8ae33f1bd0f05fbfbf6ee ]

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 <dan.carpen...@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 drivers/misc/mic/scif/scif_api.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/mic/scif/scif_api.c b/drivers/misc/mic/scif/scif_api.c
index 7b2dddcdd46d..42f7a12894d6 100644
--- a/drivers/misc/mic/scif/scif_api.c
+++ b/drivers/misc/mic/scif/scif_api.c
@@ -370,11 +370,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;
@@ -648,13 +647,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:
                /*
-- 
2.17.1