2020-05-03 14:53:40

by Ajay Singh

[permalink] [raw]
Subject: Re: [PATCH v2] staging: wilc1000: Increase the size of wid_list array



On 03/05/20 1:21 pm, Oscar Carter wrote:
> 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")
> Signed-off-by: Oscar Carter <[email protected]>


Thanks for making the changes.

Acked-by: Ajay Singh <[email protected]>


> ---
> 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(-)
>
> diff --git a/drivers/staging/wilc1000/hif.c b/drivers/staging/wilc1000/hif.c
> index 6c7de2f8d3f2..128943c3be4f 100644
> --- a/drivers/staging/wilc1000/hif.c
> +++ b/drivers/staging/wilc1000/hif.c
> @@ -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
>


2020-05-03 23:34:06

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH v2] staging: wilc1000: Increase the size of wid_list array

On Sun, 2020-05-03 at 14:52 +0000, [email protected] wrote:
> On 03/05/20 1:21 pm, Oscar Carter wrote:
> > 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")
> > Signed-off-by: Oscar Carter <[email protected]>
[]
> > diff --git a/drivers/staging/wilc1000/hif.c b/drivers/staging/wilc1000/hif.c
[]
> > @@ -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.

> > u32 index = 0;
> > u32 i, scan_timeout;
> > u8 *buffer;
> > --
> > 2.20.1