From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F66CC433E1 for ; Thu, 18 Jun 2020 02:40:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 057BE206DB for ; Thu, 18 Jun 2020 02:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592448028; bh=nL86eyKcQHOkbTW1UwAV3bPu/ILP407AXd/OXEIVkEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DRnclyBsn2tLMSG5yToRa0NTl9WQUghnEEIpZAlqJrfLBrh8a75Wyk2sBpFZubwwU inTbkW7huwCQ7YRSw1qakFG4WPT7BBD/QI8JuVfvVOyWw6n8ficvleCCQsRL4TbedB Q/A1vmY4PlNu6V7mVsDQh6D+R42DamyA6gJJetvg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727984AbgFRBMl (ORCPT ); Wed, 17 Jun 2020 21:12:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:39946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728798AbgFRBLu (ORCPT ); Wed, 17 Jun 2020 21:11:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 187A82193E; Thu, 18 Jun 2020 01:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442710; bh=nL86eyKcQHOkbTW1UwAV3bPu/ILP407AXd/OXEIVkEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iIa99vN1gLGHVx///oy7jZTJ+qpdDoA/S3STg0N2JKHEJPLGFwL9+vm8lisdZBg1o +N8hd9olE0+VsLipIi6VfUeUSg+xouGEAbqL+3FRXtrMZhiu4LfMwl2zW4ARKizupX 1pww3EjlyGIaYMokBwr3AEj34CryJ+AB0FJRpS+s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oscar Carter , Ajay Singh , Greg Kroah-Hartman , Sasha Levin , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 5.7 170/388] staging: wilc1000: Increase the size of wid_list array Date: Wed, 17 Jun 2020 21:04:27 -0400 Message-Id: <20200618010805.600873-170-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oscar Carter [ Upstream commit a4338ed2e1cf724563956ec5f91deeaabfedbe23 ] Increase by one the size of wid_list array as index variable can reach a value of 5. If this happens, an out-of-bounds access is performed. Also, use a #define instead of a hard-coded literal for the new array size. Addresses-Coverity-ID: 1451981 ("Out-of-bounds access") Fixes: f5a3cb90b802d ("staging: wilc1000: add passive scan support") Acked-by: Ajay Singh Signed-off-by: Oscar Carter Link: https://lore.kernel.org/r/20200504150911.4470-1-oscar.carter@gmx.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/wilc1000/hif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/hif.c b/drivers/staging/wilc1000/hif.c index 6c7de2f8d3f2..d025a3093015 100644 --- a/drivers/staging/wilc1000/hif.c +++ b/drivers/staging/wilc1000/hif.c @@ -11,6 +11,8 @@ #define WILC_FALSE_FRMWR_CHANNEL 100 +#define WILC_SCAN_WID_LIST_SIZE 6 + struct wilc_rcvd_mac_info { u8 status; }; @@ -151,7 +153,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, void *user_arg, struct cfg80211_scan_request *request) { int result = 0; - struct wid wid_list[5]; + struct wid wid_list[WILC_SCAN_WID_LIST_SIZE]; u32 index = 0; u32 i, scan_timeout; u8 *buffer; -- 2.25.1