2022-02-23 03:11:25

by Gustavo A. R. Silva

Subject: [PATCH 5/6][next] ath6kl: wmi: Replace one-element array with flexible-array member in struct wmi_disconnect_event

Replace one-element array with flexible-array member in struct
wmi_disconnect_event.

It's also worth noting that due to the flexible array transformation,
the size of struct wmi_disconnect_event changed (now the size is 1 byte
smaller), and in order to preserve the logic of before the transformation,
the following change is needed:

- if (len < sizeof(struct wmi_disconnect_event))
+ if (len <= sizeof(struct wmi_disconnect_event))

This issue was found with the help of Coccinelle and audited and fixed,
manually.

Link: https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays
Link: https://github.com/KSPP/linux/issues/79
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
Hi!

It'd be great if someone can confirm or comment on the following
changes described in the changelog text:

- if (len < sizeof(struct wmi_disconnect_event))
+ if (len <= sizeof(struct wmi_disconnect_event))

Thanks

drivers/net/wireless/ath/ath6kl/wmi.c | 2 +-
drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index ccdccead688e..645fb6cae3be 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1023,7 +1023,7 @@ static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len,
struct wmi_disconnect_event *ev;
wmi->traffic_class = 100;

- if (len < sizeof(struct wmi_disconnect_event))
+ if (len <= sizeof(struct wmi_disconnect_event))
return -EINVAL;

ev = (struct wmi_disconnect_event *) datap;
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 6b064e669d87..6a7fc07cd9aa 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -1596,7 +1596,7 @@ struct wmi_disconnect_event {
u8 disconn_reason;

u8 assoc_resp_len;
- u8 assoc_info[1];
+ u8 assoc_info[];
} __packed;

/*
--
2.27.0

2022-02-24 02:18:56

by Jeff Johnson

Subject: Re: [PATCH 5/6][next] ath6kl: wmi: Replace one-element array with flexible-array member in struct wmi_disconnect_event

On 2/22/2022 6:39 PM, Gustavo A. R. Silva wrote:
> Replace one-element array with flexible-array member in struct
> wmi_disconnect_event.
>
> It's also worth noting that due to the flexible array transformation,
> the size of struct wmi_disconnect_event changed (now the size is 1 byte
> smaller), and in order to preserve the logic of before the transformation,
> the following change is needed:
>
> - if (len < sizeof(struct wmi_disconnect_event))
> + if (len <= sizeof(struct wmi_disconnect_event))
>
> This issue was found with the help of Coccinelle and audited and fixed,
> manually.
>
> Link: https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays
> Link: https://github.com/KSPP/linux/issues/79
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> Hi!
>
> It'd be great if someone can confirm or comment on the following
> changes described in the changelog text:
>
> - if (len < sizeof(struct wmi_disconnect_event))
> + if (len <= sizeof(struct wmi_disconnect_event))
>
> Thanks
>
> drivers/net/wireless/ath/ath6kl/wmi.c | 2 +-
> drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
> index ccdccead688e..645fb6cae3be 100644
> --- a/drivers/net/wireless/ath/ath6kl/wmi.c
> +++ b/drivers/net/wireless/ath/ath6kl/wmi.c
> @@ -1023,7 +1023,7 @@ static int ath6kl_wmi_disconnect_event_rx(struct wmi *wmi, u8 *datap, int len,
> struct wmi_disconnect_event *ev;
> wmi->traffic_class = 100;
>
> - if (len < sizeof(struct wmi_disconnect_event))
> + if (len <= sizeof(struct wmi_disconnect_event))

this is another case where I believe the original code should remain
since that is checking that the "fixed" portion is present.

and here again what is missing in the original code is logic to verify
that the provide len is large enough to handle the advertised assoc_resp_len

> return -EINVAL;
>
> ev = (struct wmi_disconnect_event *) datap;
> diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
> index 6b064e669d87..6a7fc07cd9aa 100644
> --- a/drivers/net/wireless/ath/ath6kl/wmi.h
> +++ b/drivers/net/wireless/ath/ath6kl/wmi.h
> @@ -1596,7 +1596,7 @@ struct wmi_disconnect_event {
> u8 disconn_reason;
>
> u8 assoc_resp_len;
> - u8 assoc_info[1];
> + u8 assoc_info[];
> } __packed;
>
> /*