From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Jeff Johnson <quic_jjohnson@quicinc.com>, Kalle Valo <kvalo@kernel.org>
Cc: Kees Cook <keescook@chromium.org>,
ath10k@lists.infradead.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/6] wifi: ath10k: use flexible arrays for WMI start scan TLVs
Date: Wed, 13 Dec 2023 14:17:17 -0600 [thread overview]
Message-ID: <708ed53c-181e-4149-b544-eaf0725d58fc@embeddedor.com> (raw)
In-Reply-To: <20231213-wmi_host_mem_chunks_flexarray-v1-2-92922d92fa2c@quicinc.com>
On 12/13/23 11:06, Jeff Johnson wrote:
> Currently ath10k defines the following struct:
> struct wmi_start_scan_tlvs {
> u8 tlvs[0];
> } __packed;
>
> Per the guidance in [1] this should be a flexible array. However, a
> direct replace to u8 tlvs[] results in the compilation error:
> flexible array member in a struct with no named members
>
> This is because C99 6.7.2.1 (16) requires that a structure containing
> a flexible array member must have more than one named member.
>
> So rather than defining a separate struct wmi_start_scan_tlvs which
> contains the flexible tlvs[] array, just define the tlvs[] array where
> struct wmi_start_scan_tlvs is being used.
>
> No functional changes, compile tested only.
>
> [1] https://docs.kernel.org/process/deprecated.html#zero-length-and-one-element-arrays
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks!
--
Gustavo
> ---
> drivers/net/wireless/ath/ath10k/wmi.c | 8 ++++----
> drivers/net/wireless/ath/ath10k/wmi.h | 11 ++---------
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
> index 88befe92f95d..4d5aadbc7159 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -6927,14 +6927,14 @@ void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,
> }
>
> static void
> -ath10k_wmi_put_start_scan_tlvs(struct wmi_start_scan_tlvs *tlvs,
> +ath10k_wmi_put_start_scan_tlvs(u8 *tlvs,
> const struct wmi_start_scan_arg *arg)
> {
> struct wmi_ie_data *ie;
> struct wmi_chan_list *channels;
> struct wmi_ssid_list *ssids;
> struct wmi_bssid_list *bssids;
> - void *ptr = tlvs->tlvs;
> + void *ptr = tlvs;
> int i;
>
> if (arg->n_channels) {
> @@ -7012,7 +7012,7 @@ ath10k_wmi_op_gen_start_scan(struct ath10k *ar,
> cmd = (struct wmi_start_scan_cmd *)skb->data;
>
> ath10k_wmi_put_start_scan_common(&cmd->common, arg);
> - ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
> + ath10k_wmi_put_start_scan_tlvs(cmd->tlvs, arg);
>
> cmd->burst_duration_ms = __cpu_to_le32(0);
>
> @@ -7041,7 +7041,7 @@ ath10k_wmi_10x_op_gen_start_scan(struct ath10k *ar,
> cmd = (struct wmi_10x_start_scan_cmd *)skb->data;
>
> ath10k_wmi_put_start_scan_common(&cmd->common, arg);
> - ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);
> + ath10k_wmi_put_start_scan_tlvs(cmd->tlvs, arg);
>
> ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi 10x start scan\n");
> return skb;
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
> index 833ce0251a2c..52a409ff94e7 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> @@ -3218,23 +3218,16 @@ struct wmi_start_scan_common {
> __le32 scan_ctrl_flags;
> } __packed;
>
> -struct wmi_start_scan_tlvs {
> - /* TLV parameters. These includes channel list, ssid list, bssid list,
> - * extra ies.
> - */
> - u8 tlvs[0];
> -} __packed;
> -
> struct wmi_start_scan_cmd {
> struct wmi_start_scan_common common;
> __le32 burst_duration_ms;
> - struct wmi_start_scan_tlvs tlvs;
> + u8 tlvs[];
> } __packed;
>
> /* This is the definition from 10.X firmware branch */
> struct wmi_10x_start_scan_cmd {
> struct wmi_start_scan_common common;
> - struct wmi_start_scan_tlvs tlvs;
> + u8 tlvs[];
> } __packed;
>
> struct wmi_ssid_arg {
>
next prev parent reply other threads:[~2023-12-13 20:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 17:06 [PATCH 0/6] wifi: ath10k: use flexible arrays Jeff Johnson
2023-12-13 17:06 ` [PATCH 1/6] wifi: ath10k: use flexible array in struct wmi_host_mem_chunks Jeff Johnson
2023-12-13 19:10 ` Kees Cook
2023-12-13 20:14 ` Gustavo A. R. Silva
2023-12-18 18:47 ` Kalle Valo
2023-12-18 18:51 ` Gustavo A. R. Silva
2023-12-13 17:06 ` [PATCH 2/6] wifi: ath10k: use flexible arrays for WMI start scan TLVs Jeff Johnson
2023-12-13 19:11 ` Kees Cook
2023-12-13 20:17 ` Gustavo A. R. Silva [this message]
2023-12-13 17:06 ` [PATCH 3/6] wifi: ath10k: remove struct wmi_pdev_chanlist_update_event Jeff Johnson
2023-12-13 19:12 ` Kees Cook
2023-12-13 20:18 ` Gustavo A. R. Silva
2023-12-13 17:06 ` [PATCH 4/6] wifi: ath10k: remove unused template structs Jeff Johnson
2023-12-13 19:12 ` Kees Cook
2023-12-13 20:19 ` Gustavo A. R. Silva
2023-12-13 17:06 ` [PATCH 5/6] wifi: ath10k: use flexible array in struct wmi_tdls_peer_capabilities Jeff Johnson
2023-12-13 19:13 ` Kees Cook
2023-12-13 20:19 ` Gustavo A. R. Silva
2023-12-13 17:06 ` [PATCH 6/6] wifi: ath10k: remove duplicate memset() in 10.4 TDLS peer update Jeff Johnson
2023-12-13 19:16 ` Kees Cook
2023-12-13 19:36 ` Jeff Johnson
2023-12-13 19:37 ` Kees Cook
2023-12-13 20:20 ` Gustavo A. R. Silva
2023-12-13 20:21 ` [PATCH 0/6] wifi: ath10k: use flexible arrays Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=708ed53c-181e-4149-b544-eaf0725d58fc@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=ath10k@lists.infradead.org \
--cc=keescook@chromium.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_jjohnson@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).