misc: mic: SCIF Fix scif_get_new_port() error handling
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 2 Aug 2018 08:42:22 +0000 (11:42 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 5 Aug 2018 14:29:11 +0000 (16:29 +0200)
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.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mic/scif/scif_api.c

index 463f06d0b4ef12bcf82276e8939ae15b4a6f14b7..8dd0ccedeb94a304bb5b8217a9c834711c60af77 100644 (file)
@@ -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:
                /*