Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iio:buffer: make length types match kfifo types

Browse source 
Currently, we use int for buffer length and bytes_per_datum. However,
kfifo uses unsigned int for length and size_t for element size. We need
to make sure these matches or we will have bugs related to overflow (in
the range between INT_MAX and UINT_MAX for length, for example).

In addition, set_bytes_per_datum uses size_t while bytes_per_datum is an
int, which would cause bugs for large values of bytes_per_datum.

Change buffer length to use unsigned int and bytes_per_datum to use
size_t.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Martin Kelly 2018-03-26 14:27:51 -07:00 committed by Jonathan Cameron
parent d58109dcf3
commit c043ec1ca5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/iio/buffer/industrialio-buffer-dma.c
View file

@ -587,7 +587,7 @@ EXPORT_SYMBOL_GPL(iio_dma_buffer_set_bytes_per_datum);
* Should be used as the set_length callback for iio_buffer_access_ops * Should be used as the set_length callback for iio_buffer_access_ops
* struct for DMA buffers. * struct for DMA buffers.
*/ */
int iio_dma_buffer_set_length(struct iio_buffer *buffer, int length) int iio_dma_buffer_set_length(struct iio_buffer *buffer, unsigned int length)
{ {
/* Avoid an invalid state */ /* Avoid an invalid state */
if (length < 2) if (length < 2)

4
drivers/iio/buffer/kfifo_buf.c
View file

@ -22,7 +22,7 @@ struct iio_kfifo {
#define iio_to_kfifo(r) container_of(r, struct iio_kfifo, buffer) #define iio_to_kfifo(r) container_of(r, struct iio_kfifo, buffer)
static inline int __iio_allocate_kfifo(struct iio_kfifo *buf, static inline int __iio_allocate_kfifo(struct iio_kfifo *buf,
int bytes_per_datum, int length) size_t bytes_per_datum, unsigned int length)
{ {
if ((length == 0) || (bytes_per_datum == 0)) if ((length == 0) || (bytes_per_datum == 0))
return -EINVAL; return -EINVAL;
@ -67,7 +67,7 @@ static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
return 0; return 0;
} }
static int iio_set_length_kfifo(struct iio_buffer *r, int length) static int iio_set_length_kfifo(struct iio_buffer *r, unsigned int length)
{ {
/* Avoid an invalid state */ /* Avoid an invalid state */
if (length < 2) if (length < 2)

6
include/linux/iio/buffer_impl.h
View file

@ -53,7 +53,7 @@ struct iio_buffer_access_funcs {
int (*request_update)(struct iio_buffer *buffer); int (*request_update)(struct iio_buffer *buffer);
int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd); int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
int (*set_length)(struct iio_buffer *buffer, int length); int (*set_length)(struct iio_buffer *buffer, unsigned int length);
int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev); int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev); int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
@ -72,10 +72,10 @@ struct iio_buffer_access_funcs {
*/ */
struct iio_buffer { struct iio_buffer {
/** @length: Number of datums in buffer. */ /** @length: Number of datums in buffer. */
int length; unsigned int length;
/** @bytes_per_datum: Size of individual datum including timestamp. */ /** @bytes_per_datum: Size of individual datum including timestamp. */
int bytes_per_datum; size_t bytes_per_datum;
/** /**
* @access: Buffer access functions associated with the * @access: Buffer access functions associated with the