2020-05-04 15:26:03

by Oscar Carter

[permalink] [raw]
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 <[email protected]>
Signed-off-by: Oscar Carter <[email protected]>
---
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