Skip to contentSkip to conversation

iio: addac: Do not reference negative array offsets

PATCH Superseded Kees Cook 3 participants 4 messages Jan 5, 2022 – Jan 15, 2022

Subsystems (3)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH v2 1/1 iio: addac: Do not reference negative array offsets

Instead of aiming rx_buf at an invalid array-boundary-crossing location, just skip the first increment. Fixes this warning seen when building with -Warray-bounds:

drivers/iio/addac/ad74413r.c: In function 'ad74413r_update_scan_mode':
drivers/iio/addac/ad74413r.c:843:22: warning: array subscript -4 is below array bounds of 'u8[16]' { aka 'unsigned char[16]'} [-Warray-bounds]

  843 |         u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 * AD74413R_FRAME_SIZE];
      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/iio/addac/ad74413r.c:84:20: note: while referencing 'rx_buf'
   84 |                 u8 rx_buf[AD74413R_FRAME_SIZE * AD74413R_CHANNEL_MAX];
      |                    ^~~~~~
Cc Lars-Peter Clausen <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Cosmin Tanislav <[email protected]>
Cc Jonathan Cameron <[email protected]>
Fixes fea251b6a5db ("iio: addac: add AD74413R driver")

---
v1: https://lore.kernel.org/lkml/[email protected]/
v2:
- use "xfer" for checking "first through the loop"

---
 drivers/iio/addac/ad74413r.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/addac/ad74413r.c +4 -3
index 5271073bb74e..aba9a643a4ca 100644
@@ -840,7 +840,7 @@ static int ad74413r_update_scan_mode(struct iio_dev *indio_dev,
 {
 	struct ad74413r_state *st = iio_priv(indio_dev);
 	struct spi_transfer *xfer = st->adc_samples_xfer;
-	u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 * AD74413R_FRAME_SIZE];
+	u8 *rx_buf = st->adc_samples_buf.rx_buf;
 	u8 *tx_buf = st->adc_samples_tx_buf;
 	unsigned int channel;
 	int ret = -EINVAL;
@@ -894,9 +894,10 @@ static int ad74413r_update_scan_mode(struct iio_dev *indio_dev,
 
 		spi_message_add_tail(xfer, &st->adc_samples_msg);
 
-		xfer++;
 		tx_buf += AD74413R_FRAME_SIZE;
-		rx_buf += AD74413R_FRAME_SIZE;
+		if (xfer != st->adc_samples_xfer)
+			rx_buf += AD74413R_FRAME_SIZE;
+		xfer++;
 	}
 
 	xfer->rx_buf = rx_buf;
Signature · 1 line
2.30.2
Reviewed-by on v2 1/1
#1 lore raw

Put "iio: addac: ad74413r:" in patch title, maybe?

Quoted 79 lines

-----Original Message-----
From: Kees Cook <[email protected]>
Sent: Wednesday, January 5, 2022 8:02 PM
To: Lars-Peter Clausen <[email protected]>
Cc: Kees Cook <[email protected]>; Hennerich, Michael <[email protected]>; Tanislav, Cosmin <[email protected]>; Jonathan Cameron <[email protected]>; [email protected]; Linus Walleij <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v2] iio: addac: Do not reference negative array offsets

[External]

Instead of aiming rx_buf at an invalid array-boundary-crossing location, just skip the first increment. Fixes this warning seen when building with -Warray-bounds:

drivers/iio/addac/ad74413r.c: In function 'ad74413r_update_scan_mode':
drivers/iio/addac/ad74413r.c:843:22: warning: array subscript -4 is below array bounds of 'u8[16]' { aka 'unsigned char[16]'} [-Warray-bounds]
843 | u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *

AD74413R_FRAME_SIZE];
      |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/iio/addac/ad74413r.c:84:20: note: while referencing 'rx_buf'
   84 |                 u8 rx_buf[AD74413R_FRAME_SIZE *
AD74413R_CHANNEL_MAX];
      |                    ^~~~~~
Cc Lars-Peter Clausen <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Cosmin Tanislav <[email protected]>
Cc Jonathan Cameron <[email protected]>
Fixes fea251b6a5db ("iio: addac: add AD74413R driver")

---
v1:
https://urldefense.com/v3/__https://lore.kernel.org/lkml/20211215232321.
2069314-1- [email protected]/__;!!A3Ni8CS0y2Y!vadcwdERjyNVz3vFIp5m5S2ms oFHro8aKzH9ulwPevCKHpev6D53gibZrv5U9mPHGcoB$
v2:
- use "xfer" for checking "first through the loop"

---
 drivers/iio/addac/ad74413r.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/addac/ad74413r.c +1 -1
index 5271073bb74e..aba9a643a4ca 100644
@@ -840,7 +840,7 @@ static int ad74413r_update_scan_mode(struct iio_dev
 *indio_dev,
 {
 	struct ad74413r_state *st = iio_priv(indio_dev);
 	struct spi_transfer *xfer = st->adc_samples_xfer;
-	u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *
 AD74413R_FRAME_SIZE];
+	u8 *rx_buf = st->adc_samples_buf.rx_buf;
 	u8 *tx_buf = st->adc_samples_tx_buf;
drivers/iio/addac/ad74413r.c +3 -2
 	unsigned int channel;
 	int ret = -EINVAL;
@@ -894,9 +894,10 @@ static int ad74413r_update_scan_mode(struct
 iio_dev *indio_dev,
 
 		spi_message_add_tail(xfer, &st->adc_samples_msg);
 
-		xfer++;
 		tx_buf += AD74413R_FRAME_SIZE;
-		rx_buf += AD74413R_FRAME_SIZE;
+		if (xfer != st->adc_samples_xfer)
+			rx_buf += AD74413R_FRAME_SIZE;
+		xfer++;
 	}
 

xfer->rx_buf = rx_buf;
--
2.30.2

maintainer
#2 lore raw
Quoted 3 lines · Cosmin

Put "iio: addac: ad74413r:" in patch title, maybe?

I can fix that up whilst applying.

I'll pick this up after rc1 is out.

Thanks,

Jonathan

Quoted 81 lines
Quoted 80 lines

-----Original Message-----
From: Kees Cook <[email protected]>
Sent: Wednesday, January 5, 2022 8:02 PM
To: Lars-Peter Clausen <[email protected]>
Cc: Kees Cook <[email protected]>; Hennerich, Michael <[email protected]>; Tanislav, Cosmin <[email protected]>; Jonathan Cameron <[email protected]>; [email protected]; Linus Walleij <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v2] iio: addac: Do not reference negative array offsets

[External]

Instead of aiming rx_buf at an invalid array-boundary-crossing location, just skip the first increment. Fixes this warning seen when building with -Warray-bounds:

drivers/iio/addac/ad74413r.c: In function 'ad74413r_update_scan_mode':
drivers/iio/addac/ad74413r.c:843:22: warning: array subscript -4 is below array bounds of 'u8[16]' { aka 'unsigned char[16]'} [-Warray-bounds]
843 | u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *

AD74413R_FRAME_SIZE];
      |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/iio/addac/ad74413r.c:84:20: note: while referencing 'rx_buf'
   84 |                 u8 rx_buf[AD74413R_FRAME_SIZE *
AD74413R_CHANNEL_MAX];
      |                    ^~~~~~
Cc Lars-Peter Clausen <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Cosmin Tanislav <[email protected]>
Cc Jonathan Cameron <[email protected]>
Fixes fea251b6a5db ("iio: addac: add AD74413R driver")

---
v1:
https://urldefense.com/v3/__https://lore.kernel.org/lkml/20211215232321.
2069314-1- [email protected]/__;!!A3Ni8CS0y2Y!vadcwdERjyNVz3vFIp5m5S2ms oFHro8aKzH9ulwPevCKHpev6D53gibZrv5U9mPHGcoB$
v2:
- use "xfer" for checking "first through the loop"

---
 drivers/iio/addac/ad74413r.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/addac/ad74413r.c +1 -1
index 5271073bb74e..aba9a643a4ca 100644
@@ -840,7 +840,7 @@ static int ad74413r_update_scan_mode(struct iio_dev
 *indio_dev,
 {
 	struct ad74413r_state *st = iio_priv(indio_dev);
 	struct spi_transfer *xfer = st->adc_samples_xfer;
-	u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *
 AD74413R_FRAME_SIZE];
+	u8 *rx_buf = st->adc_samples_buf.rx_buf;
 	u8 *tx_buf = st->adc_samples_tx_buf;
drivers/iio/addac/ad74413r.c +3 -2
 	unsigned int channel;
 	int ret = -EINVAL;
@@ -894,9 +894,10 @@ static int ad74413r_update_scan_mode(struct
 iio_dev *indio_dev,
 
 		spi_message_add_tail(xfer, &st->adc_samples_msg);
 
-		xfer++;
 		tx_buf += AD74413R_FRAME_SIZE;
-		rx_buf += AD74413R_FRAME_SIZE;
+		if (xfer != st->adc_samples_xfer)
+			rx_buf += AD74413R_FRAME_SIZE;
+		xfer++;
 	}
 

xfer->rx_buf = rx_buf;
--
2.30.2

maintainer
#3 lore raw
Quoted 7 lines · On Sat, 15 Jan 2022 18:12:02 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 3 lines · Cosmin

Put "iio: addac: ad74413r:" in patch title, maybe?

I can fix that up whilst applying.

Ah. I see you already sent it again. Thanks as that's even easier.

Jonathan

Quoted 89 lines

I'll pick this up after rc1 is out.

Thanks,

Jonathan

Quoted 81 lines
Quoted 80 lines

-----Original Message-----
From: Kees Cook <[email protected]>
Sent: Wednesday, January 5, 2022 8:02 PM
To: Lars-Peter Clausen <[email protected]>
Cc: Kees Cook <[email protected]>; Hennerich, Michael <[email protected]>; Tanislav, Cosmin <[email protected]>; Jonathan Cameron <[email protected]>; [email protected]; Linus Walleij <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v2] iio: addac: Do not reference negative array offsets

[External]

Instead of aiming rx_buf at an invalid array-boundary-crossing location, just skip the first increment. Fixes this warning seen when building with -Warray-bounds:

drivers/iio/addac/ad74413r.c: In function 'ad74413r_update_scan_mode':
drivers/iio/addac/ad74413r.c:843:22: warning: array subscript -4 is below array bounds of 'u8[16]' { aka 'unsigned char[16]'} [-Warray-bounds]
843 | u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *

AD74413R_FRAME_SIZE];
      |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/iio/addac/ad74413r.c:84:20: note: while referencing 'rx_buf'
   84 |                 u8 rx_buf[AD74413R_FRAME_SIZE *
AD74413R_CHANNEL_MAX];
      |                    ^~~~~~
Cc Lars-Peter Clausen <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Cosmin Tanislav <[email protected]>
Cc Jonathan Cameron <[email protected]>
Fixes fea251b6a5db ("iio: addac: add AD74413R driver")

---
v1:
https://urldefense.com/v3/__https://lore.kernel.org/lkml/20211215232321.
2069314-1- [email protected]/__;!!A3Ni8CS0y2Y!vadcwdERjyNVz3vFIp5m5S2ms oFHro8aKzH9ulwPevCKHpev6D53gibZrv5U9mPHGcoB$
v2:
- use "xfer" for checking "first through the loop"

---
 drivers/iio/addac/ad74413r.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/addac/ad74413r.c +1 -1
index 5271073bb74e..aba9a643a4ca 100644
@@ -840,7 +840,7 @@ static int ad74413r_update_scan_mode(struct iio_dev
 *indio_dev,
 {
 	struct ad74413r_state *st = iio_priv(indio_dev);
 	struct spi_transfer *xfer = st->adc_samples_xfer;
-	u8 *rx_buf = &st->adc_samples_buf.rx_buf[-1 *
 AD74413R_FRAME_SIZE];
+	u8 *rx_buf = st->adc_samples_buf.rx_buf;
 	u8 *tx_buf = st->adc_samples_tx_buf;
drivers/iio/addac/ad74413r.c +3 -2
 	unsigned int channel;
 	int ret = -EINVAL;
@@ -894,9 +894,10 @@ static int ad74413r_update_scan_mode(struct
 iio_dev *indio_dev,
 
 		spi_message_add_tail(xfer, &st->adc_samples_msg);
 
-		xfer++;
 		tx_buf += AD74413R_FRAME_SIZE;
-		rx_buf += AD74413R_FRAME_SIZE;
+		if (xfer != st->adc_samples_xfer)
+			rx_buf += AD74413R_FRAME_SIZE;
+		xfer++;
 	}
 

xfer->rx_buf = rx_buf;
--
2.30.2