Skip to contentSkip to conversation

iio: light: noa1305: Fix up integration time look up

PATCH Applied Marek Vasut 2 participants 2 messages Aug 14, 2024 – Aug 17, 2024 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: light: noa1305: Fix up integration time look up

The current code is always iterating over two fields in the noa1305_int_time_available array. Fix iteration limit, which has to be halved to avoid out of bounds access in case the value that is being looked up is not in the array.

Fixes 025f23cfebad ("iio: light: noa1305: Make integration time configurable")

---
Cc: "Uwe Kleine-König" <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: [email protected]

---
 drivers/iio/light/noa1305.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/noa1305.c +1 -1
index da83425fd9100..25f63da70297e 100644
@@ -197,7 +197,7 @@ static int noa1305_write_raw(struct iio_dev *indio_dev,
 		return -EINVAL;
 
 	/* Look up integration time register settings and write it if found. */
-	for (i = 0; i < ARRAY_SIZE(noa1305_int_time_available); i++)
+	for (i = 0; i < ARRAY_SIZE(noa1305_int_time_available) / 2; i++)
 		if (noa1305_int_time_available[2 * i + 1] == val2)
 			return regmap_write(priv->regmap, NOA1305_REG_INTEGRATION_TIME, i);
 
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw
Quoted 9 lines · On Wed, 14 Aug 2024 21:19:09 +0200 Marek Vasut <[email protected]> wrote:

The current code is always iterating over two fields in the noa1305_int_time_available array. Fix iteration limit, which has to be halved to avoid out of bounds access in case the value that is being looked up is not in the array.

Fixes 025f23cfebad ("iio: light: noa1305: Make integration time configurable")

Applied. Thanks,

Quoted 22 lines

---
Cc: "Uwe Kleine-König" <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: [email protected]

---
 drivers/iio/light/noa1305.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/noa1305.c +1 -1
index da83425fd9100..25f63da70297e 100644
@@ -197,7 +197,7 @@ static int noa1305_write_raw(struct iio_dev *indio_dev,
 		return -EINVAL;
 
 	/* Look up integration time register settings and write it if found. */
-	for (i = 0; i < ARRAY_SIZE(noa1305_int_time_available); i++)
+	for (i = 0; i < ARRAY_SIZE(noa1305_int_time_available) / 2; i++)
 		if (noa1305_int_time_available[2 * i + 1] == val2)
 			return regmap_write(priv->regmap, NOA1305_REG_INTEGRATION_TIME, i);