| Message ID | 20180827211453.213061-1-mka@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: adc: qcom-spmi-adc5: Verify channel numbers from DT | expand |
On Mon, 27 Aug 2018 14:14:53 -0700 Matthias Kaehlcke <mka@chromium.org> wrote: > The driver only defines a subset of all possible ADC channels. Channel > numbers read from the device tree are accepted as long as they don't > exceed a max value, even when no channel definition exists. Add a > check to abort initialization in this case. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks for tidying this up. Jonathan > --- > drivers/iio/adc/qcom-spmi-adc5.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c > index 9c8e6f9e8248..ab5bec917c0a 100644 > --- a/drivers/iio/adc/qcom-spmi-adc5.c > +++ b/drivers/iio/adc/qcom-spmi-adc5.c > @@ -519,7 +519,8 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc, > return ret; > } > > - if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA) { > + if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA || > + !data->adc_chans[chan].datasheet_name) { > dev_err(dev, "%s invalid channel number %d\n", name, chan); > return -EINVAL; > }
diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c index 9c8e6f9e8248..ab5bec917c0a 100644 --- a/drivers/iio/adc/qcom-spmi-adc5.c +++ b/drivers/iio/adc/qcom-spmi-adc5.c @@ -519,7 +519,8 @@ static int adc5_get_dt_channel_data(struct adc5_chip *adc, return ret; } - if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA) { + if (chan > ADC5_PARALLEL_ISENSE_VBAT_IDATA || + !data->adc_chans[chan].datasheet_name) { dev_err(dev, "%s invalid channel number %d\n", name, chan); return -EINVAL; }
The driver only defines a subset of all possible ADC channels. Channel numbers read from the device tree are accepted as long as they don't exceed a max value, even when no channel definition exists. Add a check to abort initialization in this case. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/iio/adc/qcom-spmi-adc5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)