p54: Replace zero-length array of trailing structs with flex-array
Subsystems (3)
PATCH v2 1/1 p54: Replace zero-length array of trailing structs with flex-array
Zero-length arrays are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.
Replace zero-length array with flexible-array member.
This results in no differences in binary output (most especially because struct pda_antenna_gain is unused). The struct is kept for future reference.
[1] https://github.com/KSPP/linux/issues/78
---
v2:
- convert normally (chunkeey)
v1: https://lore.kernel.org/lkml/[email protected]/
--- drivers/net/wireless/intersil/p54/eeprom.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intersil/p54/eeprom.h +2 -2
@@ -108,10 +108,10 @@ struct pda_country { } __packed;struct pda_antenna_gain { -struct { +DECLARE_FLEX_ARRAY (struct {u8 gain_5GHz;/* 0.25 dBi units */ u8 gain_2GHz;/* 0.25 dBi units */ - } __packed antenna[0]; + } __packed, antenna); } __packed;struct pda_custom_wrapper {
Signature · 1 line
2.34.1
Quoted 5 lines · Kees Cook
Zero-length arrays are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.
Quoted 8 lines
Replace zero-length array with flexible-array member.
This results in no differences in binary output (most especially because struct
pda_antenna_gainis unused). The struct is kept for future reference.
Thank you!
Quoted 10 lines
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Quoted 25 lines
---
v2:
- convert normally (chunkeey)
v1: https://lore.kernel.org/lkml/[email protected]/--- drivers/net/wireless/intersil/p54/eeprom.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/wireless/intersil/p54/eeprom.h +2
-2@@ -108,10 +108,10 @@ struct pda_country { } __packed;struct pda_antenna_gain { -struct { +DECLARE_FLEX_ARRAY (struct {u8 gain_5GHz;/* 0.25 dBi units */ u8 gain_2GHz;/* 0.25 dBi units */ - } __packed antenna[0]; + } __packed, antenna); } __packed;struct pda_custom_wrapper {
Quoted 13 lines · Kees Cook
Zero-length arrays are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace zero-length array with flexible-array member.
This results in no differences in binary output (most especially because struct
pda_antenna_gainis unused). The struct is kept for future reference.
Quoted 10 lines
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>
I'll add "wifi:".
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [v2] wifi: p54: Replace zero-length array of trailing structs with flex-array
In reply to Kees CookQuoted 13 lines · Kees Cook
Zero-length arrays are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace zero-length array with flexible-array member.
This results in no differences in binary output (most especially because struct
pda_antenna_gainis unused). The struct is kept for future reference.
Quoted 11 lines
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc "Gustavo A. R. Silva" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Patch applied to wireless-next.git, thanks.
3b79d4bad3a0 wifi: p54: Replace zero-length array of trailing structs with flex-array
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches