Skip to contentSkip to conversation

iio: cros_ec: Avoid -Wflex-array-member-not-at-end warning

PATCH In review Gustavo A. R. Silva 5 participants 7 messages Mar 17, 2025 – Mar 18, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 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]

---

This looks pretty much like the following patch for RTC:

https://lore.kernel.org/linux-hardening/Z9PpPg06OK8ghNvm@kspp/

Thanks

 .../cros_ec_sensors/cros_ec_sensors_core.c    | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +10 -17
index 7751d6f69b12..760a07f64390 100644
@@ -34,25 +34,18 @@
 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,
+			sizeof(struct ec_response_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
#1 lore raw

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 38

Quoted 5 lines · Gustavo A. R. Silva

static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +2 -0
 					     u16 cmd_offset, u16 cmd, u32 *mask)
 {
+	DEFINE_RAW_FLEX(struct cros_ec_command, buf, data,
+			sizeof(struct ec_response_get_cmd_versions));

max(sizeof(struct ec_params_get_cmd_versions),
sizeof(struct ec_response_get_cmd_versions))?

#2 lore raw
Quoted 9 lines · Tzung-Bi Shih

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 38

Quoted 5 lines · Gustavo A. R. Silva

static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
u16 cmd_offset, u16 cmd, u32 *mask)
{

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +2 -0
+	DEFINE_RAW_FLEX(struct cros_ec_command, buf, data,
+			sizeof(struct ec_response_get_cmd_versions));

max(sizeof(struct ec_params_get_cmd_versions),
sizeof(struct ec_response_get_cmd_versions))?

I considered that, but DEFINE_RAW_FLEX() complains about it due to the

_Static_assert(__builtin_constant_p(count),				\
		       "onstack flex array members require compile-time const count");

--
Gustavo

maintainer
#3 lore raw
Quoted 11 lines · On Mon, 17 Mar 2025 15:10:38 +1030 "Gustavo A. R. Silva"…
Quoted 9 lines · Tzung-Bi Shih

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 38

Quoted 5 lines · Gustavo A. R. Silva

static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
u16 cmd_offset, u16 cmd, u32 *mask)
{

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +2 -0
+	DEFINE_RAW_FLEX(struct cros_ec_command, buf, data,
+			sizeof(struct ec_response_get_cmd_versions));  

max(sizeof(struct ec_params_get_cmd_versions),
sizeof(struct ec_response_get_cmd_versions))?

Quoted 5 lines

I considered that, but DEFINE_RAW_FLEX() complains about it due to the

_Static_assert(__builtin_constant_p(count),				\
		       "onstack flex array members require compile-time const count");

Maybe add an assert that you indeed have the larger of the two + a comment on why it matters?

Quoted 3 lines

--
Gustavo

#4 lore raw
Quoted 14 lines · Jonathan Cameron
Quoted 11 lines · On Mon, 17 Mar 2025 15:10:38 +1030 "Gustavo A. R. Silva"…
Quoted 9 lines · Tzung-Bi Shih

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 38

Quoted 5 lines · Gustavo A. R. Silva

static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
u16 cmd_offset, u16 cmd, u32 *mask)
{

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +2 -0
+	DEFINE_RAW_FLEX(struct cros_ec_command, buf, data,
+			sizeof(struct ec_response_get_cmd_versions));  

max(sizeof(struct ec_params_get_cmd_versions),
sizeof(struct ec_response_get_cmd_versions))?

Quoted 7 lines
Quoted 5 lines

I considered that, but DEFINE_RAW_FLEX() complains about it due to the

_Static_assert(__builtin_constant_p(count),				\
		       "onstack flex array members require compile-time const count");

Maybe add an assert that you indeed have the larger of the two + a comment on why it matters?

Or, is there a way for using compiler-time MAX()? I failed to find so.

#5 lore raw
Quoted 17 lines · Tzung-Bi Shih
Quoted 16 lines · Jonathan Cameron
Quoted 13 lines · On Mon, 17 Mar 2025 15:10:38 +1030 "Gustavo A. R. Silva"…
Quoted 9 lines · Tzung-Bi Shih

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c line 38

Quoted 5 lines · Gustavo A. R. Silva

static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
u16 cmd_offset, u16 cmd, u32 *mask)
{

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +2 -0
+	DEFINE_RAW_FLEX(struct cros_ec_command, buf, data,
+			sizeof(struct ec_response_get_cmd_versions));  

max(sizeof(struct ec_params_get_cmd_versions),
sizeof(struct ec_response_get_cmd_versions))?

I considered that, but DEFINE_RAW_FLEX() complains about it due to the

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
_Static_assert(__builtin_constant_p(count),				\
		       "onstack flex array members require compile-time const count");

Maybe add an assert that you indeed have the larger of the two + a comment on why it matters?

Or, is there a way for using compiler-time MAX()? I failed to find so.

Did MAX() not work? I would expect it to do compile time comparison of two sizeof()s. It can do other arithmetic no problem, e.g.:
https://elixir.bootlin.com/linux/v6.13.7/source/lib/vsprintf.c#L1097

Signature · 1 line
Kees Cook