| Message ID | 20250318-iio-adc-ad7606-improvements-v2-1-4b605427774c@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: ad7606: improvements and ad7606c parallel interface support | expand |
On Tue, 18 Mar 2025 17:52:09 -0500 David Lechner <dlechner@baylibre.com> wrote: > Check that the sw_mode_config function pointer is not NULL before > calling it. Not all buses define this callback, which resulted in a NULL > pointer dereference. > > Fixes: e571c1902116 ("iio: adc: ad7606: move scale_setup as function pointer on chip-info") > Reviewed-by: Nuno Sá <nuno.sa@analog.com> > Signed-off-by: David Lechner <dlechner@baylibre.com> Applied to my temporary fixes-togreg-testing branch. I'll rebase that once Greg's pull request has been taken by Linus. > --- > drivers/iio/adc/ad7606.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c > index 1a314fddd7eb987b52016ce7242b446677f66427..703556eb7257ea0647135c4b268a8ead93115c6f 100644 > --- a/drivers/iio/adc/ad7606.c > +++ b/drivers/iio/adc/ad7606.c > @@ -1236,9 +1236,11 @@ static int ad7616_sw_mode_setup(struct iio_dev *indio_dev) > st->write_scale = ad7616_write_scale_sw; > st->write_os = &ad7616_write_os_sw; > > - ret = st->bops->sw_mode_config(indio_dev); > - if (ret) > - return ret; > + if (st->bops->sw_mode_config) { > + ret = st->bops->sw_mode_config(indio_dev); > + if (ret) > + return ret; > + } > > /* Activate Burst mode and SEQEN MODE */ > return ad7606_write_mask(st, AD7616_CONFIGURATION_REGISTER, > @@ -1268,6 +1270,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev) > st->write_scale = ad7606_write_scale_sw; > st->write_os = &ad7606_write_os_sw; > > + if (!st->bops->sw_mode_config) > + return 0; > + > return st->bops->sw_mode_config(indio_dev); > } > >
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 1a314fddd7eb987b52016ce7242b446677f66427..703556eb7257ea0647135c4b268a8ead93115c6f 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -1236,9 +1236,11 @@ static int ad7616_sw_mode_setup(struct iio_dev *indio_dev) st->write_scale = ad7616_write_scale_sw; st->write_os = &ad7616_write_os_sw; - ret = st->bops->sw_mode_config(indio_dev); - if (ret) - return ret; + if (st->bops->sw_mode_config) { + ret = st->bops->sw_mode_config(indio_dev); + if (ret) + return ret; + } /* Activate Burst mode and SEQEN MODE */ return ad7606_write_mask(st, AD7616_CONFIGURATION_REGISTER, @@ -1268,6 +1270,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev) st->write_scale = ad7606_write_scale_sw; st->write_os = &ad7606_write_os_sw; + if (!st->bops->sw_mode_config) + return 0; + return st->bops->sw_mode_config(indio_dev); }
Check that the sw_mode_config function pointer is not NULL before calling it. Not all buses define this callback, which resulted in a NULL pointer dereference. Fixes: e571c1902116 ("iio: adc: ad7606: move scale_setup as function pointer on chip-info") Reviewed-by: Nuno Sá <nuno.sa@analog.com> Signed-off-by: David Lechner <dlechner@baylibre.com> --- drivers/iio/adc/ad7606.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)