[PATCH] staging: wlan-ng: Use flexible-array for one / zero-length arrays

From: Deepak R Varma
Date: Fri Oct 28 2022 - 08:38:38 EST


Flexible-array member should be used instead of one or zero member to
meet the need for having a dynamically sized trailing elements in a
structure. Refer to links [1] and [2] for detailed guidance on this
suggestion.

[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

Issue identified using coccicheck.

Signed-off-by: Deepak R Varma <drv@xxxxxxxxx>
---
drivers/staging/wlan-ng/p80211mgmt.h | 8 ++++----
drivers/staging/wlan-ng/p80211types.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index 1ef30d3f3159..d6fe52de2c8f 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -229,14 +229,14 @@ struct wlan_ie {
struct wlan_ie_ssid {
u8 eid;
u8 len;
- u8 ssid[1]; /* may be zero, ptrs may overlap */
+ u8 ssid[]; /* may be zero, ptrs may overlap */
} __packed;

/*-- Supported Rates -----------------------------*/
struct wlan_ie_supp_rates {
u8 eid;
u8 len;
- u8 rates[1]; /* had better be at LEAST one! */
+ u8 rates[]; /* had better be at LEAST one! */
} __packed;

/*-- FH Parameter Set ----------------------------*/
@@ -274,7 +274,7 @@ struct wlan_ie_tim {
u8 dtim_cnt;
u8 dtim_period;
u8 bitmap_ctl;
- u8 virt_bm[1];
+ u8 virt_bm[];
} __packed;

/*-- IBSS Parameter Set ---------------------------*/
@@ -288,7 +288,7 @@ struct wlan_ie_ibss_parms {
struct wlan_ie_challenge {
u8 eid;
u8 len;
- u8 challenge[1];
+ u8 challenge[];
} __packed;

/*-------------------------------------------------*/
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 6486612a8f31..b2ffd09881b0 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -234,7 +234,7 @@ struct p80211pstr32 {
/* MAC address array */
struct p80211macarray {
u32 cnt;
- u8 data[1][MAXLEN_PSTR6];
+ u8 data[][MAXLEN_PSTR6];
} __packed;

/* prototype template */
--
2.34.1