ab3100: fix off-by-one value range checking for voltage selector

PATCH RESEND Applied Axel Lin 3 participants 3 messages Jul 26, 2010 – Jul 27, 2010 Voltage and current regulator framework

lore

Share & tools

lore

Axel Lin

author

2010-07-26 07:33 UTC #0 lore raw

PATCH RESEND 1/1 ab3100: fix off-by-one value range checking for voltage selector

We use voltage selector as an array index for typ_voltages. Thus the valid range for voltage selector should be 0..voltages_len-1.

Signed-off-by Axel Lin <[email protected]>

Acked-by Mark Brown <[email protected]>

---
Simply update the changelog explaining that the reason for the limit is that it's an array index.

 drivers/regulator/ab3100.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/regulator/ab3100.c +2 -2

index 7b14a67..1179099 100644
@@ -286,7 +286,7 @@ static int ab3100_list_voltage_regulator(struct regulator_dev *reg,
 {
 	struct ab3100_regulator *abreg = reg->reg_data;
 
-	if (selector > abreg->voltages_len)
+	if (selector >= abreg->voltages_len)
 		return -EINVAL;
 	return abreg->typ_voltages[selector];
 }

@@ -318,7 +318,7 @@ static int ab3100_get_voltage_regulator(struct regulator_dev *reg)
 	regval &= 0xE0;
 	regval >>= 5;
 
-	if (regval > abreg->voltages_len) {
+	if (regval >= abreg->voltages_len) {
 		dev_err(&reg->dev,
 			"regulator register %02x contains an illegal voltage setting\n",
 			abreg->regreg);

Signature · 1 line

1.5.4.3

Linus Walleij

Acked-by on v1 1/1

2010-07-26 09:02 UTC #1 lore raw

2010/7/26 Axel Lin <[email protected]>:

Quoted 5 lines

We use voltage selector as an array index for typ_voltages. Thus the valid range for voltage selector should be 0..voltages_len-1.
Signed-off-by Axel Lin <[email protected]>
Acked-by Mark Brown <[email protected]>

Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

Liam Girdwood

Applied

2010-07-27 10:35 UTC #2 lore raw

Quoted 9 lines · Linus Walleij

2010/7/26 Axel Lin <[email protected]>:
Quoted 5 lines
We use voltage selector as an array index for typ_voltages. Thus the valid range for voltage selector should be 0..voltages_len-1.
Signed-off-by Axel Lin <[email protected]>
Acked-by Mark Brown <[email protected]>
Acked-by Linus Walleij <[email protected]>

Applied.

Thanks

Liam

Signature · 3 lines

Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk