Skip to content

Commit

Permalink
ath6kl: Replace zero-length arrays with flexible-array members
Browse files Browse the repository at this point in the history
There is a regular need in the kernel to provide a way to declare
having a dynamically sized set of trailing elements in a structure.
Kernel code should always use “flexible array members”[1] for these
cases. The older style of one-element or zero-length arrays should
no longer be used[2].

[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays

Link: https://github.com/KSPP/linux/issues/78
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220216194857.GA904059@embeddedor
  • Loading branch information
Gustavo A. R. Silva authored and Kalle Valo committed Feb 21, 2022
1 parent e9e5916 commit d9bc141
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/net/wireless/ath/ath6kl/wmi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ struct bss_bias {

struct bss_bias_info {
u8 num_bss;
struct bss_bias bss_bias[0];
struct bss_bias bss_bias[];
} __packed;

struct low_rssi_scan_params {
Expand Down Expand Up @@ -1720,7 +1720,7 @@ struct wmi_neighbor_info {

struct wmi_neighbor_report_event {
u8 num_neighbors;
struct wmi_neighbor_info neighbor[0];
struct wmi_neighbor_info neighbor[];
} __packed;

/* TKIP MIC Error Event */
Expand Down Expand Up @@ -2051,15 +2051,15 @@ struct wmi_get_keepalive_cmd {
struct wmi_set_appie_cmd {
u8 mgmt_frm_type; /* enum wmi_mgmt_frame_type */
u8 ie_len;
u8 ie_info[0];
u8 ie_info[];
} __packed;

struct wmi_set_ie_cmd {
u8 ie_id;
u8 ie_field; /* enum wmi_ie_field_type */
u8 ie_len;
u8 reserved;
u8 ie_info[0];
u8 ie_info[];
} __packed;

/* Notify the WSC registration status to the target */
Expand Down Expand Up @@ -2127,7 +2127,7 @@ struct wmi_add_wow_pattern_cmd {
u8 filter_list_id;
u8 filter_size;
u8 filter_offset;
u8 filter[0];
u8 filter[];
} __packed;

struct wmi_del_wow_pattern_cmd {
Expand Down Expand Up @@ -2360,7 +2360,7 @@ struct wmi_send_action_cmd {
__le32 freq;
__le32 wait;
__le16 len;
u8 data[0];
u8 data[];
} __packed;

struct wmi_send_mgmt_cmd {
Expand All @@ -2369,7 +2369,7 @@ struct wmi_send_mgmt_cmd {
__le32 wait;
__le32 no_cck;
__le16 len;
u8 data[0];
u8 data[];
} __packed;

struct wmi_tx_status_event {
Expand All @@ -2389,7 +2389,7 @@ struct wmi_set_appie_extended_cmd {
u8 role_id;
u8 mgmt_frm_type;
u8 ie_len;
u8 ie_info[0];
u8 ie_info[];
} __packed;

struct wmi_remain_on_chnl_event {
Expand All @@ -2406,18 +2406,18 @@ struct wmi_cancel_remain_on_chnl_event {
struct wmi_rx_action_event {
__le32 freq;
__le16 len;
u8 data[0];
u8 data[];
} __packed;

struct wmi_p2p_capabilities_event {
__le16 len;
u8 data[0];
u8 data[];
} __packed;

struct wmi_p2p_rx_probe_req_event {
__le32 freq;
__le16 len;
u8 data[0];
u8 data[];
} __packed;

#define P2P_FLAG_CAPABILITIES_REQ (0x00000001)
Expand All @@ -2431,7 +2431,7 @@ struct wmi_get_p2p_info {
struct wmi_p2p_info_event {
__le32 info_req_flags;
__le16 len;
u8 data[0];
u8 data[];
} __packed;

struct wmi_p2p_capabilities {
Expand All @@ -2450,7 +2450,7 @@ struct wmi_p2p_probe_response_cmd {
__le32 freq;
u8 destination_addr[ETH_ALEN];
__le16 len;
u8 data[0];
u8 data[];
} __packed;

/* Extended WMI (WMIX)
Expand Down

0 comments on commit d9bc141

Please sign in to comment.