iio: adc: meson-saradc: fix potential crash in meson_sar_adc_clear_fifo
Subsystems (2)
Martin Blumenstingl
reviewerPATCH 1/1 iio: adc: meson-saradc: fix potential crash in meson_sar_adc_clear_fifo
meson_sar_adc_clear_fifo passes a 0 as value-pointer to regmap_read(). In case of the meson-saradc driver this ends up in regmap_mmio_read(), where the value-pointer is de-referenced unconditionally to assign the value which was read.
Fix this by passing an actual pointer, even though all we want to do is to discard the value.
As a side-effect this fixes a sparse warning ("Using plain integer as NULL pointer") as reported by Paolo Cretaro.
--- drivers/iio/adc/meson_saradc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/meson_saradc.c +2 -2
@@ -475,13 +475,13 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev)static void meson_sar_adc_clear_fifo (struct iio_dev *indio_dev) {struct meson_sar_adc_priv *priv =iio_priv (indio_dev); -int count; +unsigned int count, tmp;for (count =0 ; count <MESON_SAR_ADC_MAX_FIFO_SIZE ; count++) {if (!meson_sar_adc_get_fifo_count (indio_dev))break ; -regmap_read (priv->regmap,MESON_SAR_ADC_FIFO_RD ,0 ); +regmap_read (priv->regmap,MESON_SAR_ADC_FIFO_RD , &tmp); } }
Signature · 1 line
2.13.0
PATCH 1/1 iio: adc: meson-saradc: fix potential crash in meson_sar_adc_clear_fifo
Quoted 7 lines · On Sun, 4 Jun 2017 15:28:23 +0200 Martin Blumenstingl…
meson_sar_adc_clear_fifopasses a 0 as value-pointer toregmap_read(). In case of the meson-saradc driver this ends up inregmap_mmio_read(), where the value-pointer is de-referenced unconditionally to assign the value which was read.
Fix this by passing an actual pointer, even though all we want to do is to discard the value.
Quoted 6 lines
As a side-effect this fixes a sparse warning ("Using plain integer as NULL pointer") as reported by Paolo Cretaro.
Fixes 3adbf3427330 ("iio: adc: add a driver for the SAR ADC found in Amlogic Meson SoCs")Reported-by Paolo Cretaro <[email protected]>Signed-off-by Martin Blumenstingl <[email protected]>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
Quoted 24 lines
--- drivers/iio/adc/meson_saradc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iio/adc/meson_saradc.c +2
-2@@ -475,13 +475,13 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev)static void meson_sar_adc_clear_fifo (struct iio_dev *indio_dev) {struct meson_sar_adc_priv *priv =iio_priv (indio_dev); -int count; +unsigned int count, tmp;for (count =0 ; count <MESON_SAR_ADC_MAX_FIFO_SIZE ; count++) {if (!meson_sar_adc_get_fifo_count (indio_dev))break ; -regmap_read (priv->regmap,MESON_SAR_ADC_FIFO_RD ,0 ); +regmap_read (priv->regmap,MESON_SAR_ADC_FIFO_RD , &tmp); } }