Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Sripad.Balwadgi@microchip.com>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 5/5] wilc1000: add valid vmm_entry check before fetching from
 TX queue
Thread-Topic: [PATCH 5/5] wilc1000: add valid vmm_entry check before fetching
 from TX queue
Thread-Index: AQHYX9K5v2GgK0DDa0m7VuNszJu7yA==
Date:   Wed, 4 May 2022 16:19:27 +0000
Message-ID: <20220504161924.2146601-5-ajay.kathat@microchip.com>
References: <20220504161924.2146601-1-ajay.kathat@microchip.com>
In-Reply-To: <20220504161924.2146601-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?/IgpJ3WuWnLgsOJeGyJN10C4dVCTfwZN4PkFak5Yz39xbRc3xD8Zp8qrhh?=
 =?iso-8859-1?Q?fpCKU7CSDwm9ENa60vIeze3rAB2GgxO0cuq8gYkF6p87ljCl2lGP+GNarY?=
 =?iso-8859-1?Q?l/pLC3++eLGAo1EgeyXVprMVjYu3XAduT7WHv0e9q4b0E9qSHzdNSQ+CI1?=
 =?iso-8859-1?Q?blR1Ix46yAc1xE+yW3rKb1SAvThNp6j6CylvZ8T+HeR+pBYAZ9sBpbWkKL?=
 =?iso-8859-1?Q?Y5hBsbkgecIZGnkeipmvMjv0SBp5DON5K02GsR1n/MZVG42npDnmCyJZu7?=
 =?iso-8859-1?Q?K83+ycW4h+qw611Eu4rcsh7qLTC23LOOb6YstdQ0EDwdgw2Bvzm3+sAzEK?=
 =?iso-8859-1?Q?6agQBiz3tZJ3yRr7Ct+kfDCzTbR/w/zk8MhO9I3XNIvaFo0Z1Kmiu1LbAb?=
 =?iso-8859-1?Q?q+fB4WbCdLshTKk8gOvi3Ms22ZsAsoyutRQaABhRP9o2VmOTcFOAHSV+8f?=
 =?iso-8859-1?Q?+doZwFg2T/HX3wYg4BxmwbR1OK6rfWjLUv2fCSXkiBJqwKv2oWZfdLCDar?=
 =?iso-8859-1?Q?TX0dAkeLq1MrgcMe/2PSZAV32pw1HCfqT1nWLwt4Iq13R5nn1cPbERpfng?=
 =?iso-8859-1?Q?kN4OFrmo3RlOc8Cws36etzh9KY46siVYK2CuPaiq9QkSbNU5oDRHl8ED5O?=
 =?iso-8859-1?Q?zVHatMe2slS1fmLJeaJzffGWYaMgzy8YcmiPsTvK9MZ8uXqAvJhQYNCR6x?=
 =?iso-8859-1?Q?tu0x5dsplr3lKxMGsxBKrElK5+tXkorzGVcia+26bZG2Ww6ZyC1JekpKTU?=
 =?iso-8859-1?Q?5IxPBKNMXe3+wEnf6/JkZKmu4pWTGh8UU9FLSbb95v4beJ8D9s8KbhOWAb?=
 =?iso-8859-1?Q?hl2+KzVLgPmHZlc9ssmzHR6vx/iuuXHXj++XXtMEGvYFp+0G51vz3PKDxN?=
 =?iso-8859-1?Q?YOyEQ1C/Pc0WN5KeClksEAG5tyVHvSPgESDCFaHV6uwUBT8d/kz6C059eI?=
 =?iso-8859-1?Q?N3kIYoGNyH64Ue9rhR8DKyzd+ZlREvsA3QLscsIFwGHX2F/+cZn2Oagg4+?=
 =?iso-8859-1?Q?dd3evkVmZScg3/M/exPF5UcsYJU8Doe8VyX92R7slc1vk3lJ3G3MJgyC7l?=
 =?iso-8859-1?Q?4f/Ysim6WY+KrEbG/Rs/Or6zRZNKVWuXDQ9ougJijcwKnUmapkzALQxtl2?=
 =?iso-8859-1?Q?7dhjyHc7LFvG3pUk6JBNfM4R3CMjtaGQ7gLMRK0W912HD3QL5f0dsBfVp9?=
 =?iso-8859-1?Q?LskFhuFlXC2s/G+hrccgcNYu1EQ4tgkIXUWz/gPPzCoQ8/M7hy54HnLoL+?=
 =?iso-8859-1?Q?fe2LyAIAgJFQ/rYuOCcqlrRKm+SHSGd8TFBjnpiZG7a5z+a+RgwF4srQH6?=
 =?iso-8859-1?Q?HJgBbaS4QDqup9fjzsWBtJdcaWrEpUNtE3MpdXbHJXrQ2nHmPxrrqEAcR9?=
 =?iso-8859-1?Q?KtQZ9ITHMs7s70xKgOoXX7LTrapEpLmGWlfty5udWdCs6AGpxr2mu0pVJ3?=
 =?iso-8859-1?Q?ugzljsJTGlGSKW+7OB2LV2pmws9nMFSYGayIsEfV9L0BAVeSwo2WLuxvGe?=
 =?iso-8859-1?Q?kgO4RsJdmBRS9MsSwdTSQyYS32yGzgT7wKaBUl/3HvuwBAkrLqCnhQREkI?=
 =?iso-8859-1?Q?eyhe4Y5SKyPxPy+zOtBZvfOSvtAoisK6buDk3X6o3uEM7vMDSm2/h3nM/5?=
 =?iso-8859-1?Q?LJkD2fyxE5EC+oA6QQLEupfi7/CV0Z6pmfBUeBS+K2rSFECehJLDBx71O4?=
 =?iso-8859-1?Q?6jLRCVPzEDnOUVwWPiWL77jmejkX9iAyVOY8JSKYezDie4pXbEkWRRbPd2?=
 =?iso-8859-1?Q?M7+mR23YN8f9HBCCGpOB4l+9AfEj5inWZisfeAgP6191eTL/IGozwp4i/H?=
 =?iso-8859-1?Q?vziQZWC4B8ty3oD/sOW5CW/y5TnjxONTXgCqCBXqi1lJdvnG86eU?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5176.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 58bf1942-d966-4c2f-1c70-08da2de9dc81
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 16:19:27.5800
 (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: 70/sOaXaVXlFBvlqNK1rYyBRoP+jzGeWSka5a1kdxrsal9PpgeGaU3aTDVCfnvmlfYkJlOUsoPBg1ol56lK+uePWOydUcAbGKHhJF95r8o8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5597
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,
        SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

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

'vmm_table' array contains the size of data buffer length including host
header length. In 'vmm_table' array, the Zero value means the end of
vmm_entries that needs to transfer to firmware which is calculated based on
VMM free size in firmware.

Use 'vmm_table' valid entry check before fetching the entry from TX queue t=
o
only copy valid number of entries to avoid possible NULL pointer exception
observed sometimes during large file transfers.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/wlan.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/w=
ireless/microchip/wilc1000/wlan.c
index fb5633a05fd5..48441f0389ca 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -875,14 +875,15 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_=
count)
 		char *bssid;
 		u8 mgmt_ptk =3D 0;
=20
+		if (vmm_table[i] =3D=3D 0 || vmm_entries_ac[i] >=3D NQUEUES)
+			break;
+
 		tqe =3D wilc_wlan_txq_remove_from_head(wilc, vmm_entries_ac[i]);
-		ac_pkt_num_to_chip[vmm_entries_ac[i]]++;
 		if (!tqe)
 			break;
=20
+		ac_pkt_num_to_chip[vmm_entries_ac[i]]++;
 		vif =3D tqe->vif;
-		if (vmm_table[i] =3D=3D 0)
-			break;
=20
 		le32_to_cpus(&vmm_table[i]);
 		vmm_sz =3D FIELD_GET(WILC_VMM_BUFFER_SIZE, vmm_table[i]);
--=20
2.25.1