mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] iio: accel: fxls8962af: clamp the device-reported FIFO sample count
@ 2026-06-13  8:13 Bryam Vargas via B4 Relay
  2026-06-14 13:43 ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Bryam Vargas via B4 Relay @ 2026-06-13  8:13 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: linux-iio, Nuno Sá,
	Andy Shevchenko, Sean Nyekjaer, linux-kernel, David Lechner

From: Bryam Vargas <hexlabsecurity@proton.me>

fxls8962af_fifo_flush() copies the number of samples the device reports
in its hardware FIFO into an on-stack buffer

	u16 buffer[FXLS8962AF_FIFO_LENGTH * 3];

which is sized for at most FXLS8962AF_FIFO_LENGTH (32) samples. The count
is read from the BUF_STATUS register and masked with a 6-bit field:

	count = reg & FXLS8962AF_BUF_STATUS_BUF_CNT;

where FXLS8962AF_BUF_STATUS_BUF_CNT is GENMASK(5, 0), so count can be
0..63 - nearly double the 32-deep FIFO the buffer is sized for. The only
check applied to it is the zero test; unlike the bmc150 flush there is no
caller-supplied bound at all. count samples are then transferred into
buffer[]:

	fxls8962af_fifo_transfer(data, buffer, count);

fxls8962af_fifo_transfer() reads count * 3 * sizeof(u16) = count * 6
bytes through regmap, so a malfunctioning, malicious or counterfeit
accelerometer (or an attacker tampering with the I2C/SPI bus) that
reports a count of 33..63 writes up to 63 * 6 = 378 bytes into the
192-byte buffer: a stack out-of-bounds write of up to 186 bytes that
clobbers the stack canary, saved registers and the return address.

Clamp count to FXLS8962AF_FIFO_LENGTH, the number of samples buffer[] is
sized for, before the transfer, mirroring the watermark clamp already
done in fxls8962af_set_watermark(). A well-formed flush reports at most
FXLS8962AF_FIFO_LENGTH samples, so legitimate devices are unaffected.

Fixes: 79e3a5bdd9ef ("iio: accel: fxls8962af: add hw buffered sampling")
Cc: stable@vger.kernel.org
Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me>
---
This is a different bug from CVE-2025-38485, the use-after-free in the same
function fixed by commit 1fe16dc1a2f5 ("iio: accel: fxls8962af: Fix use after
free in fxls8962af_fifo_flush"): that commit added a synchronize_irq() in
fxls8962af_buffer_predisable and did not bound the FIFO sample count, so this
stack overflow is still present at mainline HEAD.

I reproduced the out-of-bounds write with an in-kernel test that drives
the fxls8962af_fifo_flush() buffer geometry verbatim under KASAN
(CONFIG_KASAN_STACK=y), with the device-supplied sample count:

  count=36, no clamp:
    BUG: KASAN: stack-out-of-bounds in ...fifo_flush
    Write of size 216 ... [32, 224) 'buffer'   (the 192-byte buffer)
  with this patch (clamp to FXLS8962AF_FIFO_LENGTH): the transfer is
    bounded to 32 samples, no KASAN report.
  a well-formed (<= 32 sample) flush is unaffected, no KASAN report.

The full device range - count=63, a 378-byte write = 186 bytes past the
buffer, smashing the stack canary and the return address - reproduces the
same way under userspace AddressSanitizer on both -m32 and -m64.

The FIFO sample count is read over I2C/SPI from the accelerometer, so
triggering this requires a malicious or defective device, or tampering
on the bus.
---
 drivers/iio/accel/fxls8962af-core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
index 8763e91c63d2..fdd049223006 100644
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@ -970,6 +970,8 @@ static int fxls8962af_fifo_flush(struct iio_dev *indio_dev)
 	if (!count)
 		return 0;
 
+	count = min_t(u8, count, FXLS8962AF_FIFO_LENGTH);
+
 	data->old_timestamp = data->timestamp;
 	data->timestamp = iio_get_time_ns(indio_dev);
 

---
base-commit: 8e65320d91cdc3b241d4b94855c88459b91abf66
change-id: 20260613-b4-disp-22362900-f6014bd0594e

Best regards,
-- 
Bryam Vargas <hexlabsecurity@proton.me>



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] iio: accel: fxls8962af: clamp the device-reported FIFO sample count
  2026-06-13  8:13 [PATCH] iio: accel: fxls8962af: clamp the device-reported FIFO sample count Bryam Vargas via B4 Relay
@ 2026-06-14 13:43 ` Jonathan Cameron
  2026-06-15 10:16   ` Andy Shevchenko
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Cameron @ 2026-06-14 13:43 UTC (permalink / raw)
  To: Bryam Vargas via B4 Relay
  Cc: hexlabsecurity, linux-iio, Nuno Sá,
	Andy Shevchenko, Sean Nyekjaer, linux-kernel, David Lechner

On Sat, 13 Jun 2026 03:13:19 -0500
Bryam Vargas via B4 Relay <devnull+hexlabsecurity.proton.me@kernel.org> wrote:

> From: Bryam Vargas <hexlabsecurity@proton.me>
> 
> fxls8962af_fifo_flush() copies the number of samples the device reports
> in its hardware FIFO into an on-stack buffer
> 
> 	u16 buffer[FXLS8962AF_FIFO_LENGTH * 3];
> 
> which is sized for at most FXLS8962AF_FIFO_LENGTH (32) samples. The count
> is read from the BUF_STATUS register and masked with a 6-bit field:
> 
> 	count = reg & FXLS8962AF_BUF_STATUS_BUF_CNT;
> 
> where FXLS8962AF_BUF_STATUS_BUF_CNT is GENMASK(5, 0), so count can be
> 0..63 - nearly double the 32-deep FIFO the buffer is sized for. The only
> check applied to it is the zero test; unlike the bmc150 flush there is no
> caller-supplied bound at all. count samples are then transferred into
> buffer[]:
> 
> 	fxls8962af_fifo_transfer(data, buffer, count);
> 
> fxls8962af_fifo_transfer() reads count * 3 * sizeof(u16) = count * 6
> bytes through regmap, so a malfunctioning, malicious or counterfeit
> accelerometer (or an attacker tampering with the I2C/SPI bus) that
> reports a count of 33..63 writes up to 63 * 6 = 378 bytes into the
> 192-byte buffer: a stack out-of-bounds write of up to 186 bytes that
> clobbers the stack canary, saved registers and the return address.
> 
> Clamp count to FXLS8962AF_FIFO_LENGTH, the number of samples buffer[] is
> sized for, before the transfer, mirroring the watermark clamp already
> done in fxls8962af_set_watermark(). A well-formed flush reports at most
> FXLS8962AF_FIFO_LENGTH samples, so legitimate devices are unaffected.
> 
> Fixes: 79e3a5bdd9ef ("iio: accel: fxls8962af: add hw buffered sampling")

This is hardening against broken devices. Nice to have, but not a fix and
not back port material. In general we do harden against the simple cases
but to catch the more complex interactions would require both a hard to do
audit and significant extra code.

So nice to have this but not a fix.

One comment inline.

> Cc: stable@vger.kernel.org
> Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me>
> ---
> This is a different bug from CVE-2025-38485, the use-after-free in the same
> function fixed by commit 1fe16dc1a2f5 ("iio: accel: fxls8962af: Fix use after
> free in fxls8962af_fifo_flush"): that commit added a synchronize_irq() in
> fxls8962af_buffer_predisable and did not bound the FIFO sample count, so this
> stack overflow is still present at mainline HEAD.
> 
> I reproduced the out-of-bounds write with an in-kernel test that drives
> the fxls8962af_fifo_flush() buffer geometry verbatim under KASAN
> (CONFIG_KASAN_STACK=y), with the device-supplied sample count:
> 
>   count=36, no clamp:
>     BUG: KASAN: stack-out-of-bounds in ...fifo_flush
>     Write of size 216 ... [32, 224) 'buffer'   (the 192-byte buffer)
>   with this patch (clamp to FXLS8962AF_FIFO_LENGTH): the transfer is
>     bounded to 32 samples, no KASAN report.
>   a well-formed (<= 32 sample) flush is unaffected, no KASAN report.
> 
> The full device range - count=63, a 378-byte write = 186 bytes past the
> buffer, smashing the stack canary and the return address - reproduces the
> same way under userspace AddressSanitizer on both -m32 and -m64.
> 
> The FIFO sample count is read over I2C/SPI from the accelerometer, so
> triggering this requires a malicious or defective device, or tampering
> on the bus.
> ---
>  drivers/iio/accel/fxls8962af-core.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/iio/accel/fxls8962af-core.c b/drivers/iio/accel/fxls8962af-core.c
> index 8763e91c63d2..fdd049223006 100644
> --- a/drivers/iio/accel/fxls8962af-core.c
> +++ b/drivers/iio/accel/fxls8962af-core.c
> @@ -970,6 +970,8 @@ static int fxls8962af_fifo_flush(struct iio_dev *indio_dev)
>  	if (!count)
>  		return 0;
>  
> +	count = min_t(u8, count, FXLS8962AF_FIFO_LENGTH);
As in the other patch, why not min()?

> +
>  	data->old_timestamp = data->timestamp;
>  	data->timestamp = iio_get_time_ns(indio_dev);
>  
> 
> ---
> base-commit: 8e65320d91cdc3b241d4b94855c88459b91abf66
> change-id: 20260613-b4-disp-22362900-f6014bd0594e
> 
> Best regards,


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] iio: accel: fxls8962af: clamp the device-reported FIFO sample count
  2026-06-14 13:43 ` Jonathan Cameron
@ 2026-06-15 10:16   ` Andy Shevchenko
  0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2026-06-15 10:16 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Bryam Vargas via B4 Relay, hexlabsecurity, linux-iio,
	Nuno Sá,
	Andy Shevchenko, Sean Nyekjaer, linux-kernel, David Lechner

On Sun, Jun 14, 2026 at 02:43:37PM +0100, Jonathan Cameron wrote:
> On Sat, 13 Jun 2026 03:13:19 -0500
> Bryam Vargas via B4 Relay <devnull+hexlabsecurity.proton.me@kernel.org> wrote:

...

> > Fixes: 79e3a5bdd9ef ("iio: accel: fxls8962af: add hw buffered sampling")
> 
> This is hardening against broken devices. Nice to have, but not a fix and
> not back port material. In general we do harden against the simple cases
> but to catch the more complex interactions would require both a hard to do
> audit and significant extra code.

On top of that using min_t(u8, ...) is prone to more interesting errors,
so one basically should immediately raise a red flag here. As Jonathan
said, use min() or even clamp() as the Subject states.

	foo = clamp(bar, 0, GOO);
	if (!foo)
		return 0;

> So nice to have this but not a fix.


-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-06-15 10:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-13  8:13 [PATCH] iio: accel: fxls8962af: clamp the device-reported FIFO sample count Bryam Vargas via B4 Relay
2026-06-14 13:43 ` Jonathan Cameron
2026-06-15 10:16   ` Andy Shevchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®