[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20200504150911.4470-1-oscar.carter@gmx.com>
Date: Mon, 4 May 2020 17:09:11 +0200
From: Oscar Carter <oscar.carter@....com>
To: Adham Abozaeid <adham.abozaeid@...rochip.com>,
Ajay Singh <ajay.kathat@...rochip.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Rachel Kim <rachel.kim@...el.com>,
Johnny Kim <johnny.kim@...el.com>,
Chris Park <chris.park@...el.com>,
Dean Lee <dean.lee@...el.com>, linux-wireless@...r.kernel.org,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Oscar Carter <oscar.carter@....com>,
Joe Perches <joe@...ches.com>
Subject: [PATCH v3] staging: wilc1000: Increase the size of wid_list array
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 <ajay.kathat@...rochip.com>
Signed-off-by: Oscar Carter <oscar.carter@....com>
---
Changelog v1 -> v2
- Fix the commit for the "Fixes" tag as Ajay Singh suggested.
Changelog v2 -> v3
- Use a #define instead of a hard-coded literal for the array size as Joe
Perches suggested.
- Add the "Acked-by" tag.
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.20.1
Powered by blists - more mailing lists