iio: proximity: cros_ec_mkbp_proximity: Avoid -Wflex-array-member-not-at-end warning
Subsystems (2)
PATCH v2 1/1 iio: proximity: cros_ec_mkbp_proximity: Avoid -Wflex-array-member-not-at-end warning
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
Use the DEFINE_RAW_FLEX() helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.
So, with these changes, fix the following warning:
drivers/iio/proximity/cros_ec_mkbp_proximity.c:63:40: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
---
Changes in v2:
- Use MAX() to calculate the number of bytes for the flex array. (Kees)
v1:
- Link: https://lore.kernel.org/linux-hardening/Z9dzDB1gttXehYGO@kspp/
drivers/iio/proximity/cros_ec_mkbp_proximity.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/iio/proximity/cros_ec_mkbp_proximity.c +5 -10
@@ -59,16 +59,11 @@ static int cros_ec_mkbp_proximity_parse_state(const void *data)static int cros_ec_mkbp_proximity_query (struct cros_ec_device *ec_dev,int *state) { -struct { -struct cros_ec_command msg; -union { -struct ec_params_mkbp_info params; -u32 switches; - }; - } __packed buf = { }; -struct ec_params_mkbp_info *params = &buf.params; -struct cros_ec_command *msg = &buf.msg; -u32 *switches = &buf.switches; + DEFINE_RAW_FLEX(struct cros_ec_command, buf, data, + MAX(sizeof(u32), sizeof(struct ec_params_mkbp_info))); +struct ec_params_mkbp_info *params = (struct ec_params_mkbp_info *)buf->data; +struct cros_ec_command *msg = buf; +u32 *switches = (u32 *)buf->data;size_t insize =sizeof (*switches);int ret;
Signature · 1 line
2.43.0
Quoted 8 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
Use the
DEFINE_RAW_FLEX()helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.
Quoted 5 lines
So, with these changes, fix the following warning:
drivers/iio/proximity/cros_ec_mkbp_proximity.c:63:40: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]Signed-off-by Gustavo A. R. Silva <[email protected]>
Quoted 9 lines · On Wed, 19 Mar 2025 09:14:01 +0000 Tzung-Bi Shih <[email protected]> wrote:
Quoted 8 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
Use the
DEFINE_RAW_FLEX()helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.
Quoted 7 lines
Quoted 5 lines
So, with these changes, fix the following warning:
drivers/iio/proximity/cros_ec_mkbp_proximity.c:63:40: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]Signed-off-by Gustavo A. R. Silva <[email protected]>Reviewed-by Tzung-Bi Shih <[email protected]>
Applied.
Thanks,