lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 19 Nov 2016 12:08:34 +0100 From: Christophe JAILLET <christophe.jaillet@...adoo.fr> To: lars@...afoo.de, Michael.Hennerich@...log.com, jic23@...nel.org, knaack.h@....de, pmeerw@...erw.net, gregkh@...uxfoundation.org, eraretuya@...il.com Cc: linux-iio@...r.kernel.org, devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org, Christophe JAILLET <christophe.jaillet@...adoo.fr> Subject: [PATCH] staging: iio: ad9832: 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@...adoo.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
Powered by blists - more mailing lists