Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa4.microchip.iphmx.com: domain of
  Ajay.Kathat@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only;
  x-record-type="v=spf1"; x-record-text="v=spf1 mx
  a:ushub1.microchip.com a:smtpout.microchip.com
  -exists:%{i}.spf.microchip.iphmx.com include:servers.mcsv.net
  include:mktomail.com include:spf.protection.outlook.com ~all"
Received-SPF: None (esa4.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: 2/Vzii/G1umOr/a6aXkJDvAMqj5gyyeOqaSn3jGOBIF8OqWCqh7mqs4A4384lNaibYJf/2R9Do
 ngvyqjiU8jfOzPuRlqor/+sbEb+ygqWZh2tqHfT2+Zx82dBtSKbUv27iRt/YvDSmZYjFOLXrGR
 0FUtsBiZnxfpcc4CltkrUCa15JywA+FlamRpwJIk1+OwF8CE6aP/rrb8kfAj4F5kIjVZUBjkOX
 8bjlw6mKJvC2IrKrzufa2UUmZ3JsDUpPbjqX/qyhhPxr9U+PQzcg+iwwJYo59kiYUp8FK+aPMI
 FXg=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 1/4] staging: wilc1000: remove use of infinite loop conditions
Thread-Topic: [PATCH 1/4] staging: wilc1000: remove use of infinite loop
 conditions
Thread-Index: AQHVzSFEOFYj1tIKa0a59ayIYa8L2A==
Date:   Fri, 17 Jan 2020 10:31:23 +0000
Message-ID: <20200117160157.8706-2-ajay.kathat@microchip.com>
References: <20200117160157.8706-1-ajay.kathat@microchip.com>
In-Reply-To: <20200117160157.8706-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: db6f6df3-04fa-4aff-8dc7-08d79b386698
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2020 10:31:23.6543
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Tq/jvtpqeMvf0eAr4ieJGEm7tXZiKk4I+tO71KqGulurNxbeHQ/+DE4agpCl9aDBB456FcgOFZjzrhd0bPbU+ktvYabOlIPw7oDkzWzKbnU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2907
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Avoid the use of 'while (1)' infinite loop conditions. It's not
recommended to have infinite loop in kernel code because a small bug can
cause never ending loops so use terminator condition as suggested in
full driver review [1].

[1]. https://lore.kernel.org/linux-wireless/20191023100313.52B3F606CF@smtp.=
codeaurora.org/

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/netdev.c   |   7 +-
 drivers/staging/wilc1000/wlan.c     |  79 ++++++---------
 drivers/staging/wilc1000/wlan_cfg.c | 144 ++++++++++------------------
 3 files changed, 84 insertions(+), 146 deletions(-)

diff --git a/drivers/staging/wilc1000/netdev.c b/drivers/staging/wilc1000/n=
etdev.c
index 3fd8e008f733..960dbc8d5173 100644
--- a/drivers/staging/wilc1000/netdev.c
+++ b/drivers/staging/wilc1000/netdev.c
@@ -837,7 +837,7 @@ static const struct net_device_ops wilc_netdev_ops =3D =
{
 void wilc_netdev_cleanup(struct wilc *wilc)
 {
 	struct wilc_vif *vif;
-	int srcu_idx;
+	int srcu_idx, ifc_cnt =3D 0;
=20
 	if (!wilc)
 		return;
@@ -858,7 +858,7 @@ void wilc_netdev_cleanup(struct wilc *wilc)
 	flush_workqueue(wilc->hif_workqueue);
 	destroy_workqueue(wilc->hif_workqueue);
=20
-	do {
+	while (ifc_cnt < WILC_NUM_CONCURRENT_IFC) {
 		mutex_lock(&wilc->vif_mutex);
 		if (wilc->vif_num <=3D 0) {
 			mutex_unlock(&wilc->vif_mutex);
@@ -871,7 +871,8 @@ void wilc_netdev_cleanup(struct wilc *wilc)
 		wilc->vif_num--;
 		mutex_unlock(&wilc->vif_mutex);
 		synchronize_srcu(&wilc->srcu);
-	} while (1);
+		ifc_cnt++;
+	}
=20
 	wilc_wlan_cfg_deinit(wilc);
 	wlan_deinit_locks(wilc);
diff --git a/drivers/staging/wilc1000/wlan.c b/drivers/staging/wilc1000/wla=
n.c
index ba5446724c93..c32af7076012 100644
--- a/drivers/staging/wilc1000/wlan.c
+++ b/drivers/staging/wilc1000/wlan.c
@@ -499,37 +499,31 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_=
count)
 	wilc_wlan_txq_filter_dup_tcp_ack(dev);
 	i =3D 0;
 	sum =3D 0;
-	do {
-		if (tqe && (i < (WILC_VMM_TBL_SIZE - 1))) {
-			if (tqe->type =3D=3D WILC_CFG_PKT)
-				vmm_sz =3D ETH_CONFIG_PKT_HDR_OFFSET;
-
-			else if (tqe->type =3D=3D WILC_NET_PKT)
-				vmm_sz =3D ETH_ETHERNET_HDR_OFFSET;
-
-			else
-				vmm_sz =3D HOST_HDR_OFFSET;
+	while (tqe && (i < (WILC_VMM_TBL_SIZE - 1))) {
+		if (tqe->type =3D=3D WILC_CFG_PKT)
+			vmm_sz =3D ETH_CONFIG_PKT_HDR_OFFSET;
+		else if (tqe->type =3D=3D WILC_NET_PKT)
+			vmm_sz =3D ETH_ETHERNET_HDR_OFFSET;
+		else
+			vmm_sz =3D HOST_HDR_OFFSET;
=20
-			vmm_sz +=3D tqe->buffer_size;
+		vmm_sz +=3D tqe->buffer_size;
=20
-			if (vmm_sz & 0x3)
-				vmm_sz =3D (vmm_sz + 4) & ~0x3;
+		if (vmm_sz & 0x3)
+			vmm_sz =3D (vmm_sz + 4) & ~0x3;
=20
-			if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE)
-				break;
+		if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE)
+			break;
=20
-			vmm_table[i] =3D vmm_sz / 4;
-			if (tqe->type =3D=3D WILC_CFG_PKT)
-				vmm_table[i] |=3D BIT(10);
-			cpu_to_le32s(&vmm_table[i]);
+		vmm_table[i] =3D vmm_sz / 4;
+		if (tqe->type =3D=3D WILC_CFG_PKT)
+			vmm_table[i] |=3D BIT(10);
+		cpu_to_le32s(&vmm_table[i]);
=20
-			i++;
-			sum +=3D vmm_sz;
-			tqe =3D wilc_wlan_txq_get_next(wilc, tqe);
-		} else {
-			break;
-		}
-	} while (1);
+		i++;
+		sum +=3D vmm_sz;
+		tqe =3D wilc_wlan_txq_get_next(wilc, tqe);
+	}
=20
 	if (i =3D=3D 0)
 		goto out;
@@ -594,12 +588,8 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_c=
ount)
 				break;
 			reg &=3D ~BIT(0);
 			ret =3D func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, reg);
-			if (!ret)
-				break;
-			break;
 		}
-		break;
-	} while (1);
+	} while (0);
=20
 	if (!ret)
 		goto out_release_bus;
@@ -725,9 +715,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc,=
 u8 *buffer, int size)
 			}
 		}
 		offset +=3D tp_len;
-		if (offset >=3D size)
-			break;
-	} while (1);
+	} while (offset < size);
 }
=20
 static void wilc_wlan_handle_rxq(struct wilc *wilc)
@@ -736,11 +724,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
 	u8 *buffer;
 	struct rxq_entry_t *rqe;
=20
-	do {
-		if (wilc->quit) {
-			complete(&wilc->cfg_event);
-			break;
-		}
+	while (!wilc->quit) {
 		rqe =3D wilc_wlan_rxq_remove(wilc);
 		if (!rqe)
 			break;
@@ -750,7 +734,9 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
 		wilc_wlan_handle_rx_buff(wilc, buffer, size);
=20
 		kfree(rqe);
-	} while (1);
+	}
+	if (wilc->quit)
+		complete(&wilc->cfg_event);
 }
=20
 static void wilc_unknown_isr_ext(struct wilc *wilc)
@@ -969,21 +955,14 @@ void wilc_wlan_cleanup(struct net_device *dev)
 	struct wilc *wilc =3D vif->wilc;
=20
 	wilc->quit =3D 1;
-	do {
-		tqe =3D wilc_wlan_txq_remove_from_head(dev);
-		if (!tqe)
-			break;
+	while ((tqe =3D wilc_wlan_txq_remove_from_head(dev))) {
 		if (tqe->tx_complete_func)
 			tqe->tx_complete_func(tqe->priv, 0);
 		kfree(tqe);
-	} while (1);
+	}
=20
-	do {
-		rqe =3D wilc_wlan_rxq_remove(wilc);
-		if (!rqe)
-			break;
+	while ((rqe =3D wilc_wlan_rxq_remove(wilc)))
 		kfree(rqe);
-	} while (1);
=20
 	kfree(wilc->rx_buffer);
 	wilc->rx_buffer =3D NULL;
diff --git a/drivers/staging/wilc1000/wlan_cfg.c b/drivers/staging/wilc1000=
/wlan_cfg.c
index 2538435b82fd..fe2a7ed8e5cd 100644
--- a/drivers/staging/wilc1000/wlan_cfg.c
+++ b/drivers/staging/wilc1000/wlan_cfg.c
@@ -137,6 +137,7 @@ static void wilc_wlan_parse_response_frame(struct wilc =
*wl, u8 *info, int size)
 {
 	u16 wid;
 	u32 len =3D 0, i =3D 0;
+	struct wilc_cfg *cfg =3D &wl->cfg;
=20
 	while (size > 0) {
 		i =3D 0;
@@ -144,63 +145,42 @@ static void wilc_wlan_parse_response_frame(struct wil=
c *wl, u8 *info, int size)
=20
 		switch (FIELD_GET(WILC_WID_TYPE, wid)) {
 		case WID_CHAR:
-			do {
-				if (wl->cfg.b[i].id =3D=3D WID_NIL)
-					break;
-
-				if (wl->cfg.b[i].id =3D=3D wid) {
-					wl->cfg.b[i].val =3D info[4];
-					break;
-				}
+			while (cfg->b[i].id !=3D WID_NIL && cfg->b[i].id !=3D wid)
 				i++;
-			} while (1);
+
+			if (cfg->b[i].id =3D=3D wid)
+				cfg->b[i].val =3D info[4];
+
 			len =3D 3;
 			break;
=20
 		case WID_SHORT:
-			do {
-				struct wilc_cfg_hword *hw =3D &wl->cfg.hw[i];
+			while (cfg->hw[i].id !=3D WID_NIL && cfg->hw[i].id !=3D wid)
+				i++;
=20
-				if (hw->id =3D=3D WID_NIL)
-					break;
+			if (cfg->hw[i].id =3D=3D wid)
+				cfg->hw[i].val =3D get_unaligned_le16(&info[4]);
=20
-				if (hw->id =3D=3D wid) {
-					hw->val =3D get_unaligned_le16(&info[4]);
-					break;
-				}
-				i++;
-			} while (1);
 			len =3D 4;
 			break;
=20
 		case WID_INT:
-			do {
-				struct wilc_cfg_word *w =3D &wl->cfg.w[i];
+			while (cfg->w[i].id !=3D WID_NIL && cfg->w[i].id !=3D wid)
+				i++;
=20
-				if (w->id =3D=3D WID_NIL)
-					break;
+			if (cfg->w[i].id =3D=3D wid)
+				cfg->w[i].val =3D get_unaligned_le32(&info[4]);
=20
-				if (w->id =3D=3D wid) {
-					w->val =3D get_unaligned_le32(&info[4]);
-					break;
-				}
-				i++;
-			} while (1);
 			len =3D 6;
 			break;
=20
 		case WID_STR:
-			do {
-				if (wl->cfg.s[i].id =3D=3D WID_NIL)
-					break;
-
-				if (wl->cfg.s[i].id =3D=3D wid) {
-					memcpy(wl->cfg.s[i].str, &info[2],
-					       (info[2] + 2));
-					break;
-				}
+			while (cfg->s[i].id !=3D WID_NIL && cfg->s[i].id !=3D wid)
 				i++;
-			} while (1);
+
+			if (cfg->s[i].id =3D=3D wid)
+				memcpy(cfg->s[i].str, &info[2], info[2] + 2);
+
 			len =3D 2 + info[2];
 			break;
=20
@@ -223,16 +203,12 @@ static void wilc_wlan_parse_info_frame(struct wilc *w=
l, u8 *info)
 	if (len =3D=3D 1 && wid =3D=3D WID_STATUS) {
 		int i =3D 0;
=20
-		do {
-			if (wl->cfg.b[i].id =3D=3D WID_NIL)
-				break;
-
-			if (wl->cfg.b[i].id =3D=3D wid) {
-				wl->cfg.b[i].val =3D info[3];
-				break;
-			}
+		while (wl->cfg.b[i].id !=3D WID_NIL &&
+		       wl->cfg.b[i].id !=3D wid)
 			i++;
-		} while (1);
+
+		if (wl->cfg.b[i].id =3D=3D wid)
+			wl->cfg.b[i].val =3D info[3];
 	}
 }
=20
@@ -292,63 +268,45 @@ int wilc_wlan_cfg_get_val(struct wilc *wl, u16 wid, u=
8 *buffer,
 {
 	u8 type =3D FIELD_GET(WILC_WID_TYPE, wid);
 	int i, ret =3D 0;
+	struct wilc_cfg *cfg =3D &wl->cfg;
=20
 	i =3D 0;
 	if (type =3D=3D CFG_BYTE_CMD) {
-		do {
-			if (wl->cfg.b[i].id =3D=3D WID_NIL)
-				break;
-
-			if (wl->cfg.b[i].id =3D=3D wid) {
-				memcpy(buffer, &wl->cfg.b[i].val, 1);
-				ret =3D 1;
-				break;
-			}
+		while (cfg->b[i].id !=3D WID_NIL && cfg->b[i].id !=3D wid)
 			i++;
-		} while (1);
+
+		if (cfg->b[i].id =3D=3D wid) {
+			memcpy(buffer, &cfg->b[i].val, 1);
+			ret =3D 1;
+		}
 	} else if (type =3D=3D CFG_HWORD_CMD) {
-		do {
-			if (wl->cfg.hw[i].id =3D=3D WID_NIL)
-				break;
-
-			if (wl->cfg.hw[i].id =3D=3D wid) {
-				memcpy(buffer, &wl->cfg.hw[i].val, 2);
-				ret =3D 2;
-				break;
-			}
+		while (cfg->hw[i].id !=3D WID_NIL && cfg->hw[i].id !=3D wid)
 			i++;
-		} while (1);
+
+		if (cfg->hw[i].id =3D=3D wid) {
+			memcpy(buffer, &cfg->hw[i].val, 2);
+			ret =3D 2;
+		}
 	} else if (type =3D=3D CFG_WORD_CMD) {
-		do {
-			if (wl->cfg.w[i].id =3D=3D WID_NIL)
-				break;
-
-			if (wl->cfg.w[i].id =3D=3D wid) {
-				memcpy(buffer, &wl->cfg.w[i].val, 4);
-				ret =3D 4;
-				break;
-			}
+		while (cfg->w[i].id !=3D WID_NIL && cfg->w[i].id !=3D wid)
 			i++;
-		} while (1);
-	} else if (type =3D=3D CFG_STR_CMD) {
-		do {
-			u32 id =3D wl->cfg.s[i].id;
=20
-			if (id =3D=3D WID_NIL)
-				break;
+		if (cfg->w[i].id =3D=3D wid) {
+			memcpy(buffer, &cfg->w[i].val, 4);
+			ret =3D 4;
+		}
+	} else if (type =3D=3D CFG_STR_CMD) {
+		while (cfg->s[i].id !=3D WID_NIL && cfg->s[i].id !=3D wid)
+			i++;
=20
-			if (id =3D=3D wid) {
-				u16 size =3D get_unaligned_le16(wl->cfg.s[i].str);
+		if (cfg->s[i].id =3D=3D wid) {
+			u16 size =3D get_unaligned_le16(cfg->s[i].str);
=20
-				if (buffer_size >=3D size) {
-					memcpy(buffer, &wl->cfg.s[i].str[2],
-					       size);
-					ret =3D size;
-				}
-				break;
+			if (buffer_size >=3D size) {
+				memcpy(buffer, &cfg->s[i].str[2], size);
+				ret =3D size;
 			}
-			i++;
-		} while (1);
+		}
 	}
 	return ret;
 }
--=20
2.24.0