Skip to contentSkip to conversation

power: supply: cros_charge-control: Fix signedness bug in charge_behaviour_store()

PATCH In review Dan Carpenter 3 participants 3 messages Jul 4, 2024 – Jul 5, 2024

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

PATCH 1/1 power: supply: cros_charge-control: Fix signedness bug in charge_behaviour_store()

The C standard is vague about the signedness of enums, but in this case here, they are treated as unsigned so the error handling does not work. Use an int type to fix this.

Fixes c6ed48ef5259 ("power: supply: add ChromeOS EC based charge control driver")
---
 drivers/power/supply/cros_charge-control.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/power/supply/cros_charge-control.c +4 -5
index 73d7f2dc0fa3..3183a13eefd0 100644
@@ -204,14 +204,13 @@ static ssize_t charge_behaviour_store(struct device *dev, struct device_attribut
 {
 	struct cros_chctl_priv *priv = cros_chctl_attr_to_priv(&attr->attr,
 							       CROS_CHCTL_ATTR_CHARGE_BEHAVIOUR);
-	enum power_supply_charge_behaviour behaviour;
 	int ret;
 
-	behaviour = power_supply_charge_behaviour_parse(EC_CHARGE_CONTROL_BEHAVIOURS, buf);
-	if (behaviour < 0)
-		return behaviour;
+	ret = power_supply_charge_behaviour_parse(EC_CHARGE_CONTROL_BEHAVIOURS, buf);
+	if (ret < 0)
+		return ret;
 
-	priv->current_behaviour = behaviour;
+	priv->current_behaviour = ret;
 
 	ret = cros_chctl_configure_ec(priv);
 	if (ret < 0)
Signature · 1 line
2.43.0
maintainer Acked-by on v1 1/1
#1 lore raw

Hi Dan,

Thanks!

Quoted 6 lines · Dan Carpenter

The C standard is vague about the signedness of enums, but in this case here, they are treated as unsigned so the error handling does not work. Use an int type to fix this.

Fixes c6ed48ef5259 ("power: supply: add ChromeOS EC based charge control driver")
Quoted 30 lines
---
 drivers/power/supply/cros_charge-control.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/power/supply/cros_charge-control.c +4 -5
index 73d7f2dc0fa3..3183a13eefd0 100644
@@ -204,14 +204,13 @@ static ssize_t charge_behaviour_store(struct device *dev, struct device_attribut
 {
 	struct cros_chctl_priv *priv = cros_chctl_attr_to_priv(&attr->attr,
 							       CROS_CHCTL_ATTR_CHARGE_BEHAVIOUR);
-	enum power_supply_charge_behaviour behaviour;
 	int ret;
 
-	behaviour = power_supply_charge_behaviour_parse(EC_CHARGE_CONTROL_BEHAVIOURS, buf);
-	if (behaviour < 0)
-		return behaviour;
+	ret = power_supply_charge_behaviour_parse(EC_CHARGE_CONTROL_BEHAVIOURS, buf);
+	if (ret < 0)
+		return ret;
 
-	priv->current_behaviour = behaviour;
+	priv->current_behaviour = ret;
 
 	ret = cros_chctl_configure_ec(priv);
 	if (ret < 0)
Signature · 1 line
2.43.0
#2 lore raw
In reply to Dan Carpenter
Quoted 5 lines · Dan Carpenter

The C standard is vague about the signedness of enums, but in this case here, they are treated as unsigned so the error handling does not work. Use an int type to fix this.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git for-next

Thanks!

[1/1] power: supply: cros_charge-control: Fix signedness bug in charge_behaviour_store()

      commit: 4baf1cc54433ff7c6e5178517bc8768001416681