Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Dan Carpenter <dan.carpenter@oracle.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 003/131] misc: mic: SCIF Fix scif_get_new_port()
 error handling
Thread-Topic: [PATCH AUTOSEL 4.18 003/131] misc: mic: SCIF Fix
 scif_get_new_port() error handling
Thread-Index: AQHUQr1HAwwfXYzi6EmMHcT7qGvYtQ==
Date:   Sun, 2 Sep 2018 13:03:01 +0000
Message-ID: <20180902064601.183036-3-alexander.levin@microsoft.com>
References: <20180902064601.183036-1-alexander.levin@microsoft.com>
In-Reply-To: <20180902064601.183036-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 2c39001f-877e-4168-09e5-08d610d46a36
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Sep 2018 13:03:01.8850
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0837
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Dan Carpenter <dan.carpenter@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 >=3D 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>
Signed-off-by: Sasha Levin <alexander.levin@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 =3D scif_get_new_port();
-		if (!pn) {
-			ret =3D -ENOSPC;
+		ret =3D scif_get_new_port();
+		if (ret < 0)
 			goto scif_bind_exit;
-		}
+		pn =3D ret;
 	}
=20
 	ep->state =3D SCIFEP_BOUND;
@@ -648,13 +647,12 @@ int __scif_connect(scif_epd_t epd, struct scif_port_i=
d *dst, bool non_block)
 			err =3D -EISCONN;
 		break;
 	case SCIFEP_UNBOUND:
-		ep->port.port =3D scif_get_new_port();
-		if (!ep->port.port) {
-			err =3D -ENOSPC;
-		} else {
-			ep->port.node =3D scif_info.nodeid;
-			ep->conn_async_state =3D ASYNC_CONN_IDLE;
-		}
+		err =3D scif_get_new_port();
+		if (err < 0)
+			break;
+		ep->port.port =3D err;
+		ep->port.node =3D scif_info.nodeid;
+		ep->conn_async_state =3D ASYNC_CONN_IDLE;
 		/* Fall through */
 	case SCIFEP_BOUND:
 		/*
--=20
2.17.1