iio: cros_ec: Avoid -Wflex-array-member-not-at-end warning
Subsystems (2)
PATCH v2 1/1 iio: cros_ec: 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/common/cros_ec_sensors/cros_ec_sensors_core.c:39: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/Z9dy43vUUh4goi-Q@kspp/
.../cros_ec_sensors/cros_ec_sensors_core.c | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-)
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +11 -17
@@ -34,25 +34,19 @@static int cros_ec_get_host_cmd_version_mask (struct cros_ec_device *ec_dev,u16 cmd_offset,u16 cmd,u32 *mask) { + DEFINE_RAW_FLEX(struct cros_ec_command, buf, data, +MAX (sizeof (struct ec_response_get_cmd_versions ), + sizeof(struct ec_params_get_cmd_versions)));int ret; -struct { -struct cros_ec_command msg; -union { -struct ec_params_get_cmd_versions params; -struct ec_response_get_cmd_versions resp; - }; - } __packed buf = { - .msg = { - .command =EC_CMD_GET_CMD_VERSIONS + cmd_offset, - .insize =sizeof (struct ec_response_get_cmd_versions ), - .outsize =sizeof (struct ec_params_get_cmd_versions ) - }, - .params = {.cmd = cmd} - }; - - ret =cros_ec_cmd_xfer_status (ec_dev, &buf.msg); + + buf->command =EC_CMD_GET_CMD_VERSIONS + cmd_offset; + buf->insize =sizeof (struct ec_response_get_cmd_versions ); + buf->outsize =sizeof (struct ec_params_get_cmd_versions ); + ((struct ec_params_get_cmd_versions *)buf->data)->cmd = cmd; + + ret =cros_ec_cmd_xfer_status (ec_dev, buf);if (ret >=0 ) - *mask = buf.resp.version_mask; + *mask = ((struct ec_response_get_cmd_versions *)buf->data)->version_mask;return ret; }
Signature · 1 line
2.43.0
Quoted 53 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.So, with these changes, fix the following warning:
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c:39: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]>---
Changes in v2:
- UseMAX()to calculate the number of bytes for the flex array. (Kees)v1:
- Link: https://lore.kernel.org/linux-hardening/Z9dy43vUUh4goi-Q@kspp/.../cros_ec_sensors/cros_ec_sensors_core.c | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-)drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +5
-16@@ -34,25 +34,19 @@static int cros_ec_get_host_cmd_version_mask (struct cros_ec_device *ec_dev,u16 cmd_offset,u16 cmd,u32 *mask) { + DEFINE_RAW_FLEX(struct cros_ec_command, buf, data, +MAX (sizeof (struct ec_response_get_cmd_versions ), + sizeof(struct ec_params_get_cmd_versions)));int ret; -struct { -struct cros_ec_command msg; -union { -struct ec_params_get_cmd_versions params; -struct ec_response_get_cmd_versions resp; - }; - } __packed buf = { - .msg = { - .command =EC_CMD_GET_CMD_VERSIONS + cmd_offset, - .insize =sizeof (struct ec_response_get_cmd_versions ), - .outsize =sizeof (struct ec_params_get_cmd_versions ) - }, - .params = {.cmd = cmd} - }; - - ret =cros_ec_cmd_xfer_status (ec_dev, &buf.msg); + + buf->command =EC_CMD_GET_CMD_VERSIONS + cmd_offset;
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 51
Quoted 10 lines
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +6
-1+ buf->insize =sizeof (struct ec_response_get_cmd_versions ); + buf->outsize =sizeof (struct ec_params_get_cmd_versions ); + ((struct ec_params_get_cmd_versions *)buf->data)->cmd = cmd; + + ret =cros_ec_cmd_xfer_status (ec_dev, buf);if (ret >=0 ) - *mask = buf.resp.version_mask; + *mask = ((struct ec_response_get_cmd_versions *)buf->data)->version_mask;return ret; }
Since "params" is used twice, I'd say do like the other patch and assign it to a new variable:
struct ec_response_get_cmd_versions *params = buf->data; ... params->cmd = cmd; ... *mask = params->version_mask;
Quoted 4 lines
Signature · 2 lines
-- 2.43.0
Signature · 1 line
Kees Cook
Quoted 12 lines · Kees Cook
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 51
Quoted 8 lines
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +4
-1+ ((struct ec_params_get_cmd_versions *)buf->data)->cmd = cmd; + + ret =cros_ec_cmd_xfer_status (ec_dev, buf);if (ret >=0 ) - *mask = buf.resp.version_mask; + *mask = ((struct ec_response_get_cmd_versions *)buf->data)->version_mask;return ret; }Since "params" is used twice, I'd say do like the other patch and assign it to a new variable:
Quoted 5 lines
struct ec_response_get_cmd_versions *params = buf->data; ... params->cmd = cmd; ... *mask = params->version_mask;
Not a pushback for introducing new variables. FWIW, it uses "param" and "response" only once.
Quoted 13 lines · On Wed, 19 Mar 2025 09:13:45 +0000 Tzung-Bi Shih <[email protected]> wrote:
Quoted 12 lines · Kees Cook
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 51
Quoted 8 lines
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +4
-1+ ((struct ec_params_get_cmd_versions *)buf->data)->cmd = cmd; + + ret =cros_ec_cmd_xfer_status (ec_dev, buf);if (ret >=0 ) - *mask = buf.resp.version_mask; + *mask = ((struct ec_response_get_cmd_versions *)buf->data)->version_mask;return ret; }Since "params" is used twice, I'd say do like the other patch and assign it to a new variable:
Quoted 8 lines
Quoted 5 lines
struct ec_response_get_cmd_versions *params = buf->data; ... params->cmd = cmd; ... *mask = params->version_mask;Not a pushback for introducing new variables. FWIW, it uses "param" and "response" only once.
Given that reply I'm assuming Kees is fine with this.
Applied.
Thanks,
Jonathan
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/common/cros_ec_sensors/cros_ec_sensors_core.c:39: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]>