Skip to contentSkip to conversation

wifi: carl9170: Replace fake flex-array with flexible-array member

PATCH In review Gustavo A. R. Silva 4 participants 4 messages Mar 17, 2023 – Mar 24, 2023

Subsystems (3)
Networking Network drivers CARL9170 Linux community wireless driver
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 wifi: carl9170: Replace fake flex-array with flexible-array member

Zero-length arrays as fake flexible arrays are deprecated and we are moving towards adopting C99 flexible-array members instead.

Address the following warnings found with GCC-13 and
-fstrict-flex-arrays=3 enabled:
drivers/net/wireless/ath/carl9170/tx.c:702:61: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=] drivers/net/wireless/ath/carl9170/tx.c:701:65: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=]

This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].

Link https://github.com/KSPP/linux/issues/21
Link https://github.com/KSPP/linux/issues/267
Link https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/wireless/ath/carl9170/fwcmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/carl9170/fwcmd.h +2 -2
index ff4b3b50250c..e5bcc364f088 100644
@@ -320,9 +320,9 @@ struct carl9170_rsp {
 		struct carl9170_u32_list	rreg_res;
 		struct carl9170_u32_list	echo;
 #ifdef __CARL9170FW__
-		struct carl9170_tx_status	tx_status[0];
+		DECLARE_FLEX_ARRAY(struct carl9170_tx_status, tx_status);
 #endif /* __CARL9170FW__ */
-		struct _carl9170_tx_status	_tx_status[0];
+		DECLARE_FLEX_ARRAY(struct _carl9170_tx_status, _tx_status);
 		struct carl9170_gpio		gpio;
 		struct carl9170_tsf_rsp		tsf;
 		struct carl9170_psm		psm;
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Gustavo A. R. Silva

Zero-length arrays as fake flexible arrays are deprecated and we are moving towards adopting C99 flexible-array members instead.

Address the following warnings found with GCC-13 and
-fstrict-flex-arrays=3 enabled:
drivers/net/wireless/ath/carl9170/tx.c:702:61: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=] drivers/net/wireless/ath/carl9170/tx.c:701:65: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=]

Quoted 8 lines

This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].

Link https://github.com/KSPP/linux/issues/21
Link https://github.com/KSPP/linux/issues/267
Link https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by Gustavo A. R. Silva <[email protected]>
Acked-by Christian Lamparter <[email protected]>

FYI: Also uploaded that patch to carl9170fw.git.

Cheers,
Christian

Reviewed-by on v1 1/1
#2 lore raw
In reply to Gustavo A. R. Silva
Quoted 8 lines · Gustavo A. R. Silva

Zero-length arrays as fake flexible arrays are deprecated and we are moving towards adopting C99 flexible-array members instead.

Address the following warnings found with GCC-13 and
-fstrict-flex-arrays=3 enabled:
drivers/net/wireless/ath/carl9170/tx.c:702:61: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=] drivers/net/wireless/ath/carl9170/tx.c:701:65: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=]

Quoted 8 lines

This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].

Link https://github.com/KSPP/linux/issues/21
Link https://github.com/KSPP/linux/issues/267
Link https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by Gustavo A. R. Silva <[email protected]>

This one threw me for a moment, but then realized the patch context couldn't see the union that wrapped them. :)

Reviewed-by Kees Cook <[email protected]>
Signature · 1 line
Kees Cook
#3 lore raw
In reply to Gustavo A. R. Silva
Quoted 12 lines · Gustavo A. R. Silva

Zero-length arrays as fake flexible arrays are deprecated and we are moving towards adopting C99 flexible-array members instead.

Address the following warnings found with GCC-13 and
-fstrict-flex-arrays=3 enabled:
drivers/net/wireless/ath/carl9170/tx.c:702:61: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=] drivers/net/wireless/ath/carl9170/tx.c:701:65: warning: array subscript i is outside array bounds of ‘const struct _carl9170_tx_status[0]’ [-Warray-bounds=]

This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].

Quoted 7 lines
Link https://github.com/KSPP/linux/issues/21
Link https://github.com/KSPP/linux/issues/267
Link https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by Gustavo A. R. Silva <[email protected]>
Acked-by Christian Lamparter <[email protected]>
Reviewed-by Kees Cook <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

1be3640cbb4a wifi: carl9170: Replace fake flex-array with flexible-array member

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

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