Skip to contentSkip to conversation

staging: wilc1000: Increase the size of wid_list array

PATCH Superseded Oscar Carter 3 participants 4 messages May 3, 2020 – May 4, 2020 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

Addresses-Coverity-ID: 1451981 ("Out-of-bounds access")

Fixes f5a3cb90b802d ("staging: wilc1000: add passive scan support")

---
Changelog v1 -> v2
- Fix the commit for the "Fixes" tag as Ajay suggested.

 drivers/staging/wilc1000/hif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/hif.c +1 -1
index 6c7de2f8d3f2..128943c3be4f 100644
@@ -151,7 +151,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[6];
 	u32 index = 0;
 	u32 i, scan_timeout;
 	u8 *buffer;

--
2.20.1

Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · Oscar Carter

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

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.

Addresses-Coverity-ID: 1451981 ("Out-of-bounds access")

Fixes f5a3cb90b802d ("staging: wilc1000: add passive scan support")

Thanks for making the changes.

Quoted 23 lines

---
Changelog v1 -> v2
- Fix the commit for the "Fixes" tag as Ajay suggested.

 drivers/staging/wilc1000/hif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wilc1000/hif.c +1 -2
index 6c7de2f8d3f2..128943c3be4f 100644
@@ -151,7 +151,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[6];
        u32 index = 0;
        u32 i, scan_timeout;
        u8 *buffer;
--

2.20.1

#2 lore raw
Quoted 9 lines · On Sun, 2020-05-03 at 14:52 +0000, [email protected] wrote:
Quoted 8 lines · Oscar Carter

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

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.

Addresses-Coverity-ID: 1451981 ("Out-of-bounds access")

Fixes f5a3cb90b802d ("staging: wilc1000: add passive scan support")

[]

Quoted 1 line

drivers/staging/wilc1000/hif.c

Quoted 1 line
drivers/staging/wilc1000/hif.c +0 -0

[]

Quoted 6 lines

drivers/staging/wilc1000/hif.c int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, · line 154

Quoted 6 lines
drivers/staging/wilc1000/hif.c +1 -1
@@ -151,7 +151,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[6];

This looks like it should be using a #define instead of a hard-coded number.

Quoted 5 lines
Quoted 5 lines
drivers/staging/wilc1000/hif.c +0 -1
        u32 index = 0;
        u32 i, scan_timeout;
        u8 *buffer;
--

2.20.1

#3 lore raw
Quoted 13 lines · Joe Perches
Quoted 9 lines · On Sun, 2020-05-03 at 14:52 +0000, [email protected] wrote:
Quoted 8 lines · Oscar Carter

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

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.

Addresses-Coverity-ID: 1451981 ("Out-of-bounds access")

Fixes f5a3cb90b802d ("staging: wilc1000: add passive scan support")

[]

Quoted 1 line

drivers/staging/wilc1000/hif.c

Quoted 1 line
drivers/staging/wilc1000/hif.c +0 -0

[]

Quoted 9 lines
Quoted 6 lines

drivers/staging/wilc1000/hif.c int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type, · line 154

Quoted 6 lines
drivers/staging/wilc1000/hif.c +1 -1
@@ -151,7 +151,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[6];

This looks like it should be using a #define instead of a hard-coded number.

I agree. I will make the changes you suggested and I will resend a new version.

Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
drivers/staging/wilc1000/hif.c +0 -1
        u32 index = 0;
        u32 i, scan_timeout;
        u8 *buffer;
--

2.20.1

Thanks,
Oscar Carter