OSDN Git Service

staging:iio: Disallow modifying buffer size when buffer is enabled
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 19 Dec 2011 14:23:44 +0000 (15:23 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Dec 2011 21:38:07 +0000 (13:38 -0800)
The buffer buffer storage is only update when enabling the buffer. Changing the
buffer size while the buffer is enabled will confuse the buffer in regard to
its actual buffer size and can cause potential memory corruption. Thus it is
only safe to modify the buffer size when the buffer is disabled.

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

index 747b901..5947289 100644 (file)
@@ -396,13 +396,20 @@ ssize_t iio_buffer_write_length(struct device *dev,
                if (val == buffer->access->get_length(buffer))
                        return len;
 
-       if (buffer->access->set_length) {
-               buffer->access->set_length(buffer, val);
-               if (buffer->access->mark_param_change)
-                       buffer->access->mark_param_change(buffer);
+       mutex_lock(&indio_dev->mlock);
+       if (iio_buffer_enabled(indio_dev)) {
+               ret = -EBUSY;
+       } else {
+               if (buffer->access->set_length) {
+                       buffer->access->set_length(buffer, val);
+                       if (buffer->access->mark_param_change)
+                               buffer->access->mark_param_change(buffer);
+               }
+               ret = 0;
        }
+       mutex_unlock(&indio_dev->mlock);
 
-       return len;
+       return ret ? ret : len;
 }
 EXPORT_SYMBOL(iio_buffer_write_length);