Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: triggered-buffer: prevent possible freeing of wrong buffer

Commit ee708e6baacd ("iio: buffer: introduce support for attaching more
IIO buffers") introduced support for multiple buffers per indio_dev but
left indio_dev->buffer for a few legacy use cases.

In the case of the triggered buffer, iio_triggered_buffer_cleanup()
still assumes that indio_dev->buffer points to the buffer allocated by
iio_triggered_buffer_setup_ext(). However, since
iio_triggered_buffer_setup_ext() now calls iio_device_attach_buffer()
to attach the buffer, indio_dev->buffer will only point to the buffer
allocated by iio_device_attach_buffer() if it the first buffer attached.

This adds a check to make sure that no other buffer has been attached
yet to ensure that indio_dev->buffer will be assigned when
iio_device_attach_buffer() is called.

As per discussion in the review thread, we may want to deal with multiple
triggers per device, but this is a fix for the issue in the meantime and
any such support would be unlikely to be suitable for a backport.

Fixes: ee708e6baacd ("iio: buffer: introduce support for attaching more IIO buffers")
Signed-off-by: David Lechner <dlechner@baylibre.com>
Acked-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20231031210521.1661552-1-dlechner@baylibre.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

David Lechner and committed by
Jonathan Cameron
bce61476 c3df0e29

+10
+10
drivers/iio/buffer/industrialio-triggered-buffer.c
··· 46 46 struct iio_buffer *buffer; 47 47 int ret; 48 48 49 + /* 50 + * iio_triggered_buffer_cleanup() assumes that the buffer allocated here 51 + * is assigned to indio_dev->buffer but this is only the case if this 52 + * function is the first caller to iio_device_attach_buffer(). If 53 + * indio_dev->buffer is already set then we can't proceed otherwise the 54 + * cleanup function will try to free a buffer that was not allocated here. 55 + */ 56 + if (indio_dev->buffer) 57 + return -EADDRINUSE; 58 + 49 59 buffer = iio_kfifo_allocate(); 50 60 if (!buffer) { 51 61 ret = -ENOMEM;