Commit 6d6793ce authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Felix Fietkau

wifi: mt76: mt7921: Replace fake flex-arrays with flexible-array members

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/mediatek/mt76/mt7921/acpi_sar.c:266:25: warning: array subscript 0 is outside array bounds of ‘struct mt7921_asar_dyn_limit_v2[0]’ [-Warray-bounds=]
drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c:263:25: warning: array subscript 0 is outside array bounds of ‘struct mt7921_asar_dyn_limit[0]’ [-Warray-bounds=]
drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c:223:28: warning: array subscript <unknown> is outside array bounds of ‘struct mt7921_asar_geo_limit_v2[0]’ [-Warray-bounds=]
drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c:220:28: warning: array subscript <unknown> is outside array bounds of ‘struct mt7921_asar_geo_limit[0]’ [-Warray-bounds=]
drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.c:334:37: warning: array subscript i is outside array bounds of ‘u8[0]’ {aka ‘unsigned char[]’} [-Warray-bounds=]

Notice that the DECLARE_FLEX_ARRAY() helper allows for flexible-array
members in unions.

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/272
Link: https://gcc.gnu.org/pipermail/gcc-patches/2022-October/602902.html [1]
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 2631c5b6
...@@ -24,7 +24,7 @@ struct mt7921_asar_dyn { ...@@ -24,7 +24,7 @@ struct mt7921_asar_dyn {
u8 names[4]; u8 names[4];
u8 enable; u8 enable;
u8 nr_tbl; u8 nr_tbl;
struct mt7921_asar_dyn_limit tbl[0]; DECLARE_FLEX_ARRAY(struct mt7921_asar_dyn_limit, tbl);
} __packed; } __packed;
struct mt7921_asar_dyn_limit_v2 { struct mt7921_asar_dyn_limit_v2 {
...@@ -37,7 +37,7 @@ struct mt7921_asar_dyn_v2 { ...@@ -37,7 +37,7 @@ struct mt7921_asar_dyn_v2 {
u8 enable; u8 enable;
u8 rsvd; u8 rsvd;
u8 nr_tbl; u8 nr_tbl;
struct mt7921_asar_dyn_limit_v2 tbl[0]; DECLARE_FLEX_ARRAY(struct mt7921_asar_dyn_limit_v2, tbl);
} __packed; } __packed;
struct mt7921_asar_geo_band { struct mt7921_asar_geo_band {
...@@ -55,7 +55,7 @@ struct mt7921_asar_geo { ...@@ -55,7 +55,7 @@ struct mt7921_asar_geo {
u8 names[4]; u8 names[4];
u8 version; u8 version;
u8 nr_tbl; u8 nr_tbl;
struct mt7921_asar_geo_limit tbl[0]; DECLARE_FLEX_ARRAY(struct mt7921_asar_geo_limit, tbl);
} __packed; } __packed;
struct mt7921_asar_geo_limit_v2 { struct mt7921_asar_geo_limit_v2 {
...@@ -69,7 +69,7 @@ struct mt7921_asar_geo_v2 { ...@@ -69,7 +69,7 @@ struct mt7921_asar_geo_v2 {
u8 version; u8 version;
u8 rsvd; u8 rsvd;
u8 nr_tbl; u8 nr_tbl;
struct mt7921_asar_geo_limit_v2 tbl[0]; DECLARE_FLEX_ARRAY(struct mt7921_asar_geo_limit_v2, tbl);
} __packed; } __packed;
struct mt7921_asar_cl { struct mt7921_asar_cl {
...@@ -85,7 +85,7 @@ struct mt7921_asar_fg { ...@@ -85,7 +85,7 @@ struct mt7921_asar_fg {
u8 rsvd; u8 rsvd;
u8 nr_flag; u8 nr_flag;
u8 rsvd1; u8 rsvd1;
u8 flag[0]; u8 flag[];
} __packed; } __packed;
struct mt7921_acpi_sar { struct mt7921_acpi_sar {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment