]> git.karo-electronics.de Git - linux-beck.git/commitdiff
iio: buffer: Fix NULL pointer deref caused by empty scan mask
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 15 Jun 2012 16:08:59 +0000 (18:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Jun 2012 21:39:19 +0000 (14:39 -0700)
iio_scan_mask_match() returns NULL if the passed in scan mask is empty. This
will happen if no channel has been selected and buffer is enabled.
iio_sw_buffer_preenable() will assign NULL to indio_dev->active_scan_mask in
this case. As a result iio_update_demux() will cause a NULL pointer deref,
because it expects active_scan_mask to be non-NULL.

Since it does not make much sense to start data capture if there is no data to
capture this patch updates the code to fail gracefully in iio_scan_mask_match()
instead of crashing the kernel.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/industrialio-buffer.c

index ac185b8694bd7b1be5066df05921e34f201b1ba6..2f35db93cdb6ef3a8594b74effb93e0f64e971ea 100644 (file)
@@ -553,6 +553,10 @@ int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
                                            buffer->scan_mask);
        else
                indio_dev->active_scan_mask = buffer->scan_mask;
+
+       if (indio_dev->active_scan_mask == NULL)
+               return -EINVAL;
+
        iio_update_demux(indio_dev);
 
        if (indio_dev->info->update_scan_mode)