diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2011-12-12 08:33:14 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-13 00:51:03 (GMT) |
| commit | 8fe64955e47277abf4a3ec56383ea9b9487bd029 (patch) | |
| tree | e7919ac09cbdb4d27ee04ae1e16b9c4f02fb6d99 /drivers/staging/iio | |
| parent | 641b4bb5f1c51a68f5aec7d3b47c96b39820b105 (diff) | |
| download | linux-8fe64955e47277abf4a3ec56383ea9b9487bd029.tar.xz | |
staging:iio:kfifo_buf: Fix potential buffer overflow in iio_read_first_n_kfifo
n is the number of bytes to read, not the number of samples. So if there is
enough data available we will write to the userspace buffer beyond its bounds.
Fix this by copying n bytes maximum. Also round n down to the next multiple of
the sample size, so we will only read complete samples. If the buffer is too
small to hold at least one sample return -EINVAL.
Also update the documentation of read_first_n to reflect the fact that 'n' is
supposed to be in bytes and not in samples.
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>
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/buffer.h | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/kfifo_buf.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/iio/buffer.h b/drivers/staging/iio/buffer.h index c697099..44593b2 100644 --- a/drivers/staging/iio/buffer.h +++ b/drivers/staging/iio/buffer.h @@ -21,7 +21,7 @@ struct iio_buffer; * @mark_in_use: reference counting, typically to prevent module removal * @unmark_in_use: reduce reference count when no longer using buffer * @store_to: actually store stuff to the buffer - * @read_first_n: try to get a specified number of elements (must exist) + * @read_first_n: try to get a specified number of bytes (must exist) * @mark_param_change: notify buffer that some relevant parameter has changed * Often this means the underlying storage may need to * change. diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c index d8867ab..b69cca5 100644 --- a/drivers/staging/iio/kfifo_buf.c +++ b/drivers/staging/iio/kfifo_buf.c @@ -160,7 +160,11 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r, int ret, copied; struct iio_kfifo *kf = iio_to_kfifo(r); - ret = kfifo_to_user(&kf->kf, buf, r->bytes_per_datum*n, &copied); + if (n < r->bytes_per_datum) + return -EINVAL; + + n = rounddown(n, r->bytes_per_datum); + ret = kfifo_to_user(&kf->kf, buf, n, &copied); return copied; } |