| Message ID | cc67cee7-9c65-46d2-aae3-f860fc3cc461@stanley.mountain (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [next] iio: adc: ad4030: fix error pointer dereference in probe() | expand |
On Fri, 2025-02-28 at 12:35 +0300, Dan Carpenter wrote: > The intention here was obviously to return an error if devm_regmap_init() > fails, but the return statement was accidentally left out. This leads to > an error pointer dereference when we call: > > ret = ad4030_detect_chip_info(st); > > Add the return statement. > > Fixes: ec25cf6f1ee3 ("iio: adc: ad4030: add support for ad4632-16 and ad4632- > 24") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- Reviewed-by: Nuno Sá <nuno.sa@analog.com> > There is a second Smatch warning which we may want to fix as well: > > drivers/iio/adc/ad4030.c:397 ad4030_get_chan_scale() > error: 'scan_type' dereferencing possible ERR_PTR() > > There's not error checking on iio_get_current_scan_type(). > > drivers/iio/adc/ad4030.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/ad4030.c b/drivers/iio/adc/ad4030.c > index ab5497c8ea1e..b7caf7e89710 100644 > --- a/drivers/iio/adc/ad4030.c > +++ b/drivers/iio/adc/ad4030.c > @@ -1014,8 +1014,8 @@ static int ad4030_probe(struct spi_device *spi) > st->regmap = devm_regmap_init(dev, &ad4030_regmap_bus, st, > &ad4030_regmap_config); > if (IS_ERR(st->regmap)) > - dev_err_probe(dev, PTR_ERR(st->regmap), > - "Failed to initialize regmap\n"); > + return dev_err_probe(dev, PTR_ERR(st->regmap), > + "Failed to initialize regmap\n"); > > st->chip = spi_get_device_match_data(spi); > if (!st->chip)
diff --git a/drivers/iio/adc/ad4030.c b/drivers/iio/adc/ad4030.c index ab5497c8ea1e..b7caf7e89710 100644 --- a/drivers/iio/adc/ad4030.c +++ b/drivers/iio/adc/ad4030.c @@ -1014,8 +1014,8 @@ static int ad4030_probe(struct spi_device *spi) st->regmap = devm_regmap_init(dev, &ad4030_regmap_bus, st, &ad4030_regmap_config); if (IS_ERR(st->regmap)) - dev_err_probe(dev, PTR_ERR(st->regmap), - "Failed to initialize regmap\n"); + return dev_err_probe(dev, PTR_ERR(st->regmap), + "Failed to initialize regmap\n"); st->chip = spi_get_device_match_data(spi); if (!st->chip)
The intention here was obviously to return an error if devm_regmap_init() fails, but the return statement was accidentally left out. This leads to an error pointer dereference when we call: ret = ad4030_detect_chip_info(st); Add the return statement. Fixes: ec25cf6f1ee3 ("iio: adc: ad4030: add support for ad4632-16 and ad4632-24") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- There is a second Smatch warning which we may want to fix as well: drivers/iio/adc/ad4030.c:397 ad4030_get_chan_scale() error: 'scan_type' dereferencing possible ERR_PTR() There's not error checking on iio_get_current_scan_type(). drivers/iio/adc/ad4030.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)