* [PATCH] staging: iio: ad9832: allocate data before using
@ 2016-11-08 14:00 Arnd Bergmann
2016-11-08 20:24 ` Jonathan Cameron
2016-11-09 6:51 ` Eva Rachel Retuya
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-11-08 14:00 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Arnd Bergmann, Lars-Peter Clausen, Michael Hennerich,
Hartmut Knaack, Peter Meerwald-Stadler, Greg Kroah-Hartman,
Eva Rachel Retuya, linux-iio, devel, linux-kernel
The regulator changes assigned data to an uninitialized pointer:
drivers/staging/iio/frequency/ad9832.c: In function 'ad9832_probe':
drivers/staging/iio/frequency/ad9832.c:214:11: error: 'st' may be used uninitialized in this function [-Werror=maybe-uninitialized]
This moves the allocation of the 'st' structure before its first
use, as it should have been.
Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/staging/iio/frequency/ad9832.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 639047fade30..a5b2f068168d 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -211,6 +211,13 @@ 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->avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(st->avdd))
return PTR_ERR(st->avdd);
@@ -233,13 +240,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;
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: iio: ad9832: allocate data before using
2016-11-08 14:00 [PATCH] staging: iio: ad9832: allocate data before using Arnd Bergmann
@ 2016-11-08 20:24 ` Jonathan Cameron
2016-11-09 6:51 ` Eva Rachel Retuya
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2016-11-08 20:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Lars-Peter Clausen, Michael Hennerich, Hartmut Knaack,
Peter Meerwald-Stadler, Greg Kroah-Hartman, Eva Rachel Retuya,
linux-iio, devel, linux-kernel
On 08/11/16 14:00, Arnd Bergmann wrote:
> The regulator changes assigned data to an uninitialized pointer:
>
> drivers/staging/iio/frequency/ad9832.c: In function 'ad9832_probe':
> drivers/staging/iio/frequency/ad9832.c:214:11: error: 'st' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>
> This moves the allocation of the 'st' structure before its first
> use, as it should have been.
>
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks Arnd.
I think I've gotten too reliant on zero day and clearly am not checking my local
build warnings closely enough. Time to go back to doing pre push out checks more
thoroughly.
Anyhow, applied to the togreg branch of iio.git. Will probably be the weekend
at least before I send another pull request.
Thanks,
Jonathan
> ---
> drivers/staging/iio/frequency/ad9832.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..a5b2f068168d 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,13 @@ 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->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,13 +240,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;
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: iio: ad9832: allocate data before using
2016-11-08 14:00 [PATCH] staging: iio: ad9832: allocate data before using Arnd Bergmann
2016-11-08 20:24 ` Jonathan Cameron
@ 2016-11-09 6:51 ` Eva Rachel Retuya
1 sibling, 0 replies; 3+ messages in thread
From: Eva Rachel Retuya @ 2016-11-09 6:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jonathan Cameron, Lars-Peter Clausen, Michael Hennerich,
Hartmut Knaack, Peter Meerwald-Stadler, Greg Kroah-Hartman,
linux-iio, devel, linux-kernel
On Tue, Nov 08, 2016 at 03:00:49PM +0100, Arnd Bergmann wrote:
> The regulator changes assigned data to an uninitialized pointer:
>
> drivers/staging/iio/frequency/ad9832.c: In function 'ad9832_probe':
> drivers/staging/iio/frequency/ad9832.c:214:11: error: 'st' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>
> This moves the allocation of the 'st' structure before its first
> use, as it should have been.
>
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thank you, I completely missed this. Will be more careful next time.
Eva
> ---
> drivers/staging/iio/frequency/ad9832.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..a5b2f068168d 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,13 @@ 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->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,13 +240,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;
>
> --
> 2.9.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-09 6:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-08 14:00 [PATCH] staging: iio: ad9832: allocate data before using Arnd Bergmann
2016-11-08 20:24 ` Jonathan Cameron
2016-11-09 6:51 ` 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).