Skip to contentSkip to conversation

hwmon: (cros-ec_hwmon) Fix access to restricted __le16

PATCH Applied Guenter Roeck 3 participants 7 messages Jun 6, 2024 – Jun 7, 2024

Subsystems (3)
lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

PATCH 1/1 hwmon: (cros-ec_hwmon) Fix access to restricted __le16

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
---
 drivers/hwmon/cros_ec_hwmon.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/hwmon/cros_ec_hwmon.c +3 -2
index 41f268fa8260..f586987c3502 100644
@@ -26,12 +26,13 @@ struct cros_ec_hwmon_priv {
 static int cros_ec_hwmon_read_fan_speed(struct cros_ec_device *cros_ec, u8 index, u16 *speed)
 {
 	int ret;
+	__le16 __speed;
 
-	ret = cros_ec_cmd_readmem(cros_ec, EC_MEMMAP_FAN + index * 2, 2, speed);
+	ret = cros_ec_cmd_readmem(cros_ec, EC_MEMMAP_FAN + index * 2, 2, &__speed);
 	if (ret < 0)
 		return ret;
 
-	*speed = le16_to_cpu(*speed);
+	*speed = le16_to_cpu(__speed);
 	return 0;
 }
 
Signature · 1 line
2.39.2
maintainer Acked-by on v1 1/1
#1 lore raw

Thanks!

Quoted 10 lines · Guenter Roeck

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>

Guenter, does sparse work locally for you?

When I run it via "make C=1 drivers/hwmon/cros_ec_hwmon.o" I only get some random warnings from included headers but nothing of value.

Tzung-Bi, could you pick up this patch through chrome-platform? (And also "hwmon: (cros_ec) Prevent read overflow in probe()" [0])

[0] https://lore.kernel.org/lkml/[email protected]/

Quoted 27 lines
---
 drivers/hwmon/cros_ec_hwmon.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/hwmon/cros_ec_hwmon.c +3 -2
index 41f268fa8260..f586987c3502 100644
@@ -26,12 +26,13 @@ struct cros_ec_hwmon_priv {
 static int cros_ec_hwmon_read_fan_speed(struct cros_ec_device *cros_ec, u8 index, u16 *speed)
 {
 	int ret;
+	__le16 __speed;
 
-	ret = cros_ec_cmd_readmem(cros_ec, EC_MEMMAP_FAN + index * 2, 2, speed);
+	ret = cros_ec_cmd_readmem(cros_ec, EC_MEMMAP_FAN + index * 2, 2, &__speed);
 	if (ret < 0)
 		return ret;
 
-	*speed = le16_to_cpu(*speed);
+	*speed = le16_to_cpu(__speed);
 	return 0;
 }
 
Signature · 1 line
2.39.2
author maintainer
#2 lore raw
Quoted 9 lines · Thomas Weißschuh

Thanks!

Quoted 6 lines · Guenter Roeck

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Quoted 9 lines
Quoted 4 lines
Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>

Guenter, does sparse work locally for you?

It does, but I use the version from git://repo.or.cz/smatch.git.

Guenter

#3 lore raw
Quoted 15 lines · Guenter Roeck
Quoted 14 lines · Thomas Weißschuh

Thanks!

Quoted 10 lines · Guenter Roeck

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Quoted 6 lines
Quoted 4 lines

Guenter, does sparse work locally for you?

It does, but I use the version from git://repo.or.cz/smatch.git.

That does indeed look much better, thanks.

I have another question about the endianness conversion in general. The only places I see doing a conversion are cros_ec_sensors_cmd_read_u16() and the original cros_ec hwmon driver.

Also the documentation of the EC protocol does not specify anything in that regard.
Instead there is the following comment in host_event_set_bit():

/*
* The overall host event implementation assumes it's running on and
* communicating with little-endian architectures.
*/

Can the conversion be dropped?

author maintainer
#4 lore raw
Quoted 34 lines · Thomas Weißschuh
Quoted 15 lines · Guenter Roeck
Quoted 14 lines · Thomas Weißschuh

Thanks!

Quoted 10 lines · Guenter Roeck

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Quoted 6 lines
Quoted 4 lines

Guenter, does sparse work locally for you?

It does, but I use the version from git://repo.or.cz/smatch.git.

That does indeed look much better, thanks.

I have another question about the endianness conversion in general. The only places I see doing a conversion are cros_ec_sensors_cmd_read_u16() and the original cros_ec hwmon driver.

Also the documentation of the EC protocol does not specify anything in that regard.
Instead there is the following comment in host_event_set_bit():

Quoted 7 lines

/*
* The overall host event implementation assumes it's running on and
* communicating with little-endian architectures.
*/

Can the conversion be dropped?

Unless it is wrong I don't see a reason to drop it.

Guenter

#5 lore raw
In reply to Guenter Roeck
This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Quoted 4 lines · On Thu, 6 Jun 2024 11:05:07 -0700 you wrote:

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Quoted 8 lines

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>

[...]

Here is the summary with links:
- hwmon: (cros-ec_hwmon) Fix access to restricted __le16

    https://git.kernel.org/chrome-platform/c/c8a4bdca928d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#6 lore raw
In reply to Guenter Roeck
This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Quoted 4 lines · On Thu, 6 Jun 2024 11:05:07 -0700 you wrote:

0-day complains:

drivers-hwmon-cros_ec_hwmon.c:sparse:sparse:cast-to-restricted-__le16

Quoted 8 lines

Fix by using a __le16 typed variable as parameter to le16_to_cpu().

Fixes bc3e45258096 ("hwmon: add ChromeOS EC driver")
Cc Thomas Weißschuh <[email protected]>
Cc Tzung-Bi Shih <[email protected]>

[...]

Here is the summary with links:
- hwmon: (cros-ec_hwmon) Fix access to restricted __le16

    https://git.kernel.org/chrome-platform/c/c8a4bdca928d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html