ath11k: Replace zero-length arrays with flexible-array members

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/20220216194836.GA904035@embeddedor

diff --git a/drivers/net/wireless/ath/ath11k/ce.h b/drivers/net/wireless/ath/ath11k/ce.h
index 8255b6cfab0c767b46e56fde46649b3cc2df4d2f..9644ff909502e9e4476da86f4052bb5129611191 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ce.h
+++ b/drivers/net/wireless/ath/ath11k/ce.h
@@ -145,7 +145,7 @@ struct ath11k_ce_ring {
        u32 hal_ring_id;
 
        /* keep last */
-       struct sk_buff *skb[0];
+       struct sk_buff *skb[];
 };
 
 struct ath11k_ce_pipe {

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 10846e9e871a927e437b2cd132251a2387a3988e..d2fc7a7a98f4cd59a8d71933aa059cdb407209d8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -815,7 +815,7 @@ struct ath11k_base {
        } id;
 
        /* must be last */
-       u8 drv_priv[0] __aligned(sizeof(void *));
+       u8 drv_priv[] __aligned(sizeof(void *));
 };
 
 struct ath11k_fw_stats_pdev {

diff --git a/drivers/net/wireless/ath/ath11k/dp.h b/drivers/net/wireless/ath/ath11k/dp.h
index b6ec2d6a2bb61a3eea7febd7d293e0bc5b911f6e..e9dfa209098b1fe8385114e880a7ea02ddd679a1 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/dp.h
+++ b/drivers/net/wireless/ath/ath11k/dp.h
@@ -1173,12 +1173,12 @@ struct ath11k_htt_ppdu_stats_msg {
        u32 ppdu_id;
        u32 timestamp;
        u32 rsvd;
-       u8 data[0];
+       u8 data[];
 } __packed;
 
 struct htt_tlv {
        u32 header;
-       u8 value[0];
+       u8 value[];
 } __packed;
 
 #define HTT_TLV_TAG                    GENMASK(11, 0)
@@ -1365,7 +1365,7 @@ struct htt_ppdu_stats_usr_cmn_array {
         * tx_ppdu_stats_info is variable length, with length =
         *     number_of_ppdu_stats * sizeof (struct htt_tx_ppdu_stats_info)
         */
-       struct htt_tx_ppdu_stats_info tx_ppdu_info[0];
+       struct htt_tx_ppdu_stats_info tx_ppdu_info[];
 } __packed;
 
 struct htt_ppdu_user_stats {
@@ -1427,7 +1427,7 @@ struct htt_ppdu_stats_info {
  */
 struct htt_pktlog_msg {
        u32 hdr;
-       u8 payload[0];
+       u8 payload[];
 };
 
 /**
@@ -1648,7 +1648,7 @@ struct ath11k_htt_extd_stats_msg {
        u32 info0;
        u64 cookie;
        u32 info1;
-       u8 data[0];
+       u8 data[];
 } __packed;
 
 #define        HTT_MAC_ADDR_L32_0      GENMASK(7, 0)

diff --git a/drivers/net/wireless/ath/ath11k/rx_desc.h b/drivers/net/wireless/ath/ath11k/rx_desc.h
index 79c50804d7dcd6aac2bf12f43aaa329b3820563b..26ecc1bcd9d5735ab30fb965c43d29adc0d307f8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/rx_desc.h
+++ b/drivers/net/wireless/ath/ath11k/rx_desc.h
@@ -1445,7 +1445,7 @@ struct hal_rx_desc_ipq8074 {
        __le32 hdr_status_tag;
        __le32 phy_ppdu_id;
        u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];
-       u8 msdu_payload[0];
+       u8 msdu_payload[];
 } __packed;
 
 struct hal_rx_desc_qcn9074 {
@@ -1464,7 +1464,7 @@ struct hal_rx_desc_qcn9074 {
        __le32 hdr_status_tag;
        __le32 phy_ppdu_id;
        u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];
-       u8 msdu_payload[0];
+       u8 msdu_payload[];
 } __packed;
 
 struct hal_rx_desc_wcn6855 {
@@ -1483,7 +1483,7 @@ struct hal_rx_desc_wcn6855 {
        __le32 hdr_status_tag;
        __le32 phy_ppdu_id;
        u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN];
-       u8 msdu_payload[0];
+       u8 msdu_payload[];
 } __packed;
 
 struct hal_rx_desc {

diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c
index 4100cc1449a2ba152979b2349d43640aa1536861..2b18871d5f7cbc0f0f3df789c46d20010514b6b0 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/spectral.c
+++ b/drivers/net/wireless/ath/ath11k/spectral.c
@@ -107,7 +107,7 @@ struct spectral_search_fft_report {
        __le32 info1;
        __le32 info2;
        __le32 reserve0;
-       u8 bins[0];
+       u8 bins[];
 } __packed;
 
 struct ath11k_spectral_search_report {