diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2021-05-13 15:07:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-03 09:00:33 +0200 |
| commit | f70122825076117787b91e7f219e21c09f11a5b9 (patch) | |
| tree | 142c7b8650294f1ce0b2c9941b5f3fdcd981e3af /drivers/iio/adc | |
| parent | fbb02b5e7a34fcc0b40698f0b4535b93251c48aa (diff) | |
| download | kernel_replicant_linux-f70122825076117787b91e7f219e21c09f11a5b9.tar.gz kernel_replicant_linux-f70122825076117787b91e7f219e21c09f11a5b9.tar.bz2 kernel_replicant_linux-f70122825076117787b91e7f219e21c09f11a5b9.zip | |
iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers
commit f2a772c51206b0c3f262e4f6a3812c89a650191b upstream.
Channel numbering must start at 0 and then not have any holes, or
it is possible to overflow the available storage. Note this bug was
introduced as part of a fix to ensure we didn't rely on the ordering
of child nodes. So we need to support arbitrary ordering but they all
need to be there somewhere.
Note I hit this when using qemu to test the rest of this series.
Arguably this isn't the best fix, but it is probably the most minimal
option for backporting etc.
Alexandru's sign-off is here because he carried this patch in a larger
set that Jonathan then applied.
Fixes: d7857e4ee1ba6 ("iio: adc: ad7124: Fix DT channel configuration")
Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/adc')
| -rw-r--r-- | drivers/iio/adc/ad7124.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index c0d0870a29ff..9c2401c5848e 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -616,6 +616,13 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, if (ret) goto err; + if (channel >= indio_dev->num_channels) { + dev_err(indio_dev->dev.parent, + "Channel index >= number of channels\n"); + ret = -EINVAL; + goto err; + } + ret = of_property_read_u32_array(child, "diff-channels", ain, 2); if (ret) |