Skip to contentSkip to conversation

iwlegacy: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

PATCH In review Gustavo A. R. Silva 3 participants 3 messages Sep 26, 2022 – Sep 28, 2022

Subsystems (3)
Networking Network drivers Intel wireless 3945ABG/bg, 4965AGN (iwlegacy)
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 iwlegacy: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

Zero-length arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace zero-length arrays declarations in anonymous union with the new DECLARE_FLEX_ARRAY() helper macro.

This helper allows for flexible-array members in unions.

Link https://github.com/KSPP/linux/issues/193
Link https://github.com/KSPP/linux/issues/223
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/wireless/intel/iwlegacy/commands.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlegacy/commands.h +2 -2
index 4a97310f8fee..28cf4e832152 100644
@@ -1710,7 +1710,7 @@ struct il4965_tx_resp {
 	 */
 	union {
 		__le32 status;
-		struct agg_tx_status agg_status[0];	/* for each agg frame */
+		DECLARE_FLEX_ARRAY(struct agg_tx_status, agg_status);	/* for each agg frame */
 	} u;
 } __packed;
 

@@ -3365,7 +3365,7 @@ struct il_rx_pkt {
 		struct il_compressed_ba_resp compressed_ba;
 		struct il_missed_beacon_notif missed_beacon;
 		__le32 status;
-		u8 raw[0];
+		DECLARE_FLEX_ARRAY(u8, raw);
 	} u;
 } __packed;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Gustavo A. R. Silva

Zero-length arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace zero-length arrays declarations in anonymous union with the new DECLARE_FLEX_ARRAY() helper macro.

This helper allows for flexible-array members in unions.

Link https://github.com/KSPP/linux/issues/193
Link https://github.com/KSPP/linux/issues/223
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>
Reviewed-by Kees Cook <[email protected]>
Signature · 1 line
Kees Cook
#2 lore raw
In reply to Gustavo A. R. Silva
Quoted 5 lines · Gustavo A. R. Silva

Zero-length arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace zero-length arrays declarations in anonymous union with the new DECLARE_FLEX_ARRAY() helper macro.

Quoted 7 lines

This helper allows for flexible-array members in unions.

Link https://github.com/KSPP/linux/issues/193
Link https://github.com/KSPP/linux/issues/223
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>
Reviewed-by Kees Cook <[email protected]>

Patch applied to wireless-next.git, thanks.

56df3d408a8f iwlegacy: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/YzIvzc0jsYLigO8a@work/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches