* [PATCH] staging: iio: ad9832:
@ 2016-11-19 11:08 Christophe JAILLET
2016-11-19 11:24 ` Jonathan Cameron
2016-11-19 11:47 ` Eva Rachel Retuya
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2016-11-19 11:08 UTC (permalink / raw)
To: lars, Michael.Hennerich, jic23, knaack.h, pmeerw, gregkh,
eraretuya
Cc: linux-iio, devel, linux-kernel, kernel-janitors,
Christophe JAILLET
Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
some dereference of 'st' which is an un-initialized pointer at this point.
Re-order code and tweak error handling in order to allocate memory and have
'st' be a valid pointer before using it.
Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only
---
drivers/staging/iio/frequency/ad9832.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 639047fade30..16894836f982 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
return -ENODEV;
}
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+ if (!indio_dev)
+ return -ENOMEM;
+
+ spi_set_drvdata(spi, indio_dev);
+ st = iio_priv(indio_dev);
+ st->mclk = pdata->mclk;
+ st->spi = spi;
+
st->avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(st->avdd))
return PTR_ERR(st->avdd);
@@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
goto error_disable_avdd;
}
- indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
- if (!indio_dev) {
- ret = -ENOMEM;
- goto error_disable_dvdd;
- }
- spi_set_drvdata(spi, indio_dev);
- st = iio_priv(indio_dev);
- st->mclk = pdata->mclk;
- st->spi = spi;
-
indio_dev->dev.parent = &spi->dev;
indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->info = &ad9832_info;
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] staging: iio: ad9832:
2016-11-19 11:08 [PATCH] staging: iio: ad9832: Christophe JAILLET
@ 2016-11-19 11:24 ` Jonathan Cameron
2016-11-19 11:47 ` Eva Rachel Retuya
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2016-11-19 11:24 UTC (permalink / raw)
To: Christophe JAILLET, lars, Michael.Hennerich, knaack.h, pmeerw,
gregkh, eraretuya
Cc: linux-iio, devel, linux-kernel, kernel-janitors
On 19/11/16 11:08, Christophe JAILLET wrote:
> Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
> commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
> some dereference of 'st' which is an un-initialized pointer at this point.
>
> Re-order code and tweak error handling in order to allocate memory and have
> 'st' be a valid pointer before using it.
>
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Thanks but fixed already.
6826fdbd2 "staging: iio: ad9832: allocate data before using
Arnd Bergmann
Jonathan
> ---
> Compile tested only
> ---
> drivers/staging/iio/frequency/ad9832.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..16894836f982 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
> return -ENODEV;
> }
>
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!indio_dev)
> + return -ENOMEM;
> +
> + spi_set_drvdata(spi, indio_dev);
> + st = iio_priv(indio_dev);
> + st->mclk = pdata->mclk;
> + st->spi = spi;
> +
> st->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
> goto error_disable_avdd;
> }
>
> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> - if (!indio_dev) {
> - ret = -ENOMEM;
> - goto error_disable_dvdd;
> - }
> - spi_set_drvdata(spi, indio_dev);
> - st = iio_priv(indio_dev);
> - st->mclk = pdata->mclk;
> - st->spi = spi;
> -
> indio_dev->dev.parent = &spi->dev;
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->info = &ad9832_info;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] staging: iio: ad9832:
2016-11-19 11:08 [PATCH] staging: iio: ad9832: Christophe JAILLET
2016-11-19 11:24 ` Jonathan Cameron
@ 2016-11-19 11:47 ` Eva Rachel Retuya
1 sibling, 0 replies; 3+ messages in thread
From: Eva Rachel Retuya @ 2016-11-19 11:47 UTC (permalink / raw)
To: Christophe JAILLET
Cc: lars, Michael.Hennerich, jic23, knaack.h, pmeerw, gregkh,
linux-iio, devel, linux-kernel, kernel-janitors
On Sat, Nov 19, 2016 at 12:08:34PM +0100, Christophe JAILLET wrote:
> Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
> commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
> some dereference of 'st' which is an un-initialized pointer at this point.
>
> Re-order code and tweak error handling in order to allocate memory and have
> 'st' be a valid pointer before using it.
Hello,
Thanks for the patch but this fix was already submitted and applied:
https://git.kernel.org/cgit/linux/kernel/git/jic23/iio.git/commit/?h=testing&id=6826fdbd2e207f8107e65c5a372ac616e7af11b4
Eva
>
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only
> ---
> drivers/staging/iio/frequency/ad9832.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..16894836f982 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
> return -ENODEV;
> }
>
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!indio_dev)
> + return -ENOMEM;
> +
> + spi_set_drvdata(spi, indio_dev);
> + st = iio_priv(indio_dev);
> + st->mclk = pdata->mclk;
> + st->spi = spi;
> +
> st->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
> goto error_disable_avdd;
> }
>
> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> - if (!indio_dev) {
> - ret = -ENOMEM;
> - goto error_disable_dvdd;
> - }
> - spi_set_drvdata(spi, indio_dev);
> - st = iio_priv(indio_dev);
> - st->mclk = pdata->mclk;
> - st->spi = spi;
> -
> indio_dev->dev.parent = &spi->dev;
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->info = &ad9832_info;
> --
> 2.9.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-19 11:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-19 11:08 [PATCH] staging: iio: ad9832: Christophe JAILLET
2016-11-19 11:24 ` Jonathan Cameron
2016-11-19 11:47 ` Eva Rachel Retuya
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).