From: Nicholas Mc Guire <der.herr@hofr.at>
To: Yizhuo <yzhai003@ucr.edu>
Cc: csong@cs.ucr.edu, zhiyunq@cs.ucr.edu,
Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Kevin Hilman <khilman@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Thomas Gleixner <tglx@linutronix.de>,
Nicholas Mc Guire <hofrat@osadl.org>,
linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: adc: meson-saradc: Variables could be uninitalized if regmap_read() fails
Date: Sat, 28 Sep 2019 08:47:20 +0200 [thread overview]
Message-ID: <20190928064720.GA24515@osadl.at> (raw)
In-Reply-To: <20190928004642.28932-1-yzhai003@ucr.edu>
On Fri, Sep 27, 2019 at 05:46:41PM -0700, Yizhuo wrote:
> Several functions in this file are trying to use regmap_read() to
> initialize the specific variable, however, if regmap_read() fails,
> the variable could be uninitialized but used directly, which is
> potentially unsafe. The return value of regmap_read() should be
> checked and handled.
>
> Signed-off-by: Yizhuo <yzhai003@ucr.edu>
Just a few minor style issues - contentwise it look correct to me.
Reviewed-by: Nicholas Mc Guire <hofrat@osadl.org>
> ---
> drivers/iio/adc/meson_saradc.c | 28 +++++++++++++++++++++++-----
> 1 file changed, 23 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
> index 7b28d045d271..c032a64108b4 100644
> --- a/drivers/iio/adc/meson_saradc.c
> +++ b/drivers/iio/adc/meson_saradc.c
> @@ -323,6 +323,7 @@ static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev)
> {
> struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
> int regval, timeout = 10000;
> + int ret;
>
> /*
> * NOTE: we need a small delay before reading the status, otherwise
> @@ -331,7 +332,9 @@ static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev)
> */
> do {
> udelay(1);
> - regmap_read(priv->regmap, MESON_SAR_ADC_REG0, ®val);
> + ret = regmap_read(priv->regmap, MESON_SAR_ADC_REG0, ®val);
> + if (ret)
> + return ret;
> } while (FIELD_GET(MESON_SAR_ADC_REG0_BUSY_MASK, regval) && timeout--);
>
> if (timeout < 0)
> @@ -358,7 +361,11 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev,
any reason not to declear ret in the declaration block ?
so just for consistency with coding style within meson_saradc.c
this might be:
int regval, fifo_chan, fifo_val, count;
+ int ret;
> return -EINVAL;
> }
>
> - regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, ®val);
> + int ret = regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, ®val);
+ ret = regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, ®val);
> +
> + if (ret)
> + return ret;
> +
> fifo_chan = FIELD_GET(MESON_SAR_ADC_FIFO_RD_CHAN_ID_MASK, regval);
> if (fifo_chan != chan->address) {
> dev_err(&indio_dev->dev,
> @@ -491,6 +498,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev)
> {
> struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
> int val, timeout = 10000;
> + int ret;
>
> mutex_lock(&indio_dev->mlock);
>
> @@ -506,7 +514,10 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev)
> */
> do {
> udelay(1);
> - regmap_read(priv->regmap, MESON_SAR_ADC_DELAY, &val);
> + ret = regmap_read(priv->regmap,
> + MESON_SAR_ADC_DELAY, &val);
checkpatch does not fuss here but the continuation should be alligned
witht the ( here
> + if (ret)
> + return ret;
> } while (val & MESON_SAR_ADC_DELAY_BL30_BUSY && timeout--);
>
> if (timeout < 0) {
> @@ -784,7 +795,10 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev)
> * BL30 to make sure BL30 gets the values it expects when
> * reading the temperature sensor.
> */
> - regmap_read(priv->regmap, MESON_SAR_ADC_REG3, ®val);
> + ret = regmap_read(priv->regmap, MESON_SAR_ADC_REG3, ®val);
> + if (ret)
> + return ret;
> +
> if (regval & MESON_SAR_ADC_REG3_BL30_INITIALIZED)
> return 0;
> }
> @@ -1014,7 +1028,11 @@ static irqreturn_t meson_sar_adc_irq(int irq, void *data)
> unsigned int cnt, threshold;
> u32 regval;
same as above
+ int ret;
>
> - regmap_read(priv->regmap, MESON_SAR_ADC_REG0, ®val);
> + int ret = regmap_read(priv->regmap, MESON_SAR_ADC_REG0, ®val);
+ ret = regmap_read(priv->regmap, MESON_SAR_ADC_REG0, ®val);
> +
> + if (ret)
> + return ret;
> +
> cnt = FIELD_GET(MESON_SAR_ADC_REG0_FIFO_COUNT_MASK, regval);
> threshold = FIELD_GET(MESON_SAR_ADC_REG0_FIFO_CNT_IRQ_MASK, regval);
>
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-09-28 6:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-28 0:46 [PATCH] iio: adc: meson-saradc: Variables could be uninitalized if regmap_read() fails Yizhuo
2019-09-28 6:47 ` Nicholas Mc Guire [this message]
2019-09-29 16:54 ` Yizhuo Zhai
2019-09-29 16:48 Yizhuo
2019-09-30 21:16 ` Martin Blumenstingl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190928064720.GA24515@osadl.at \
--to=der.herr@hofr.at \
--cc=csong@cs.ucr.edu \
--cc=hofrat@osadl.org \
--cc=jic23@kernel.org \
--cc=khilman@baylibre.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=narmstrong@baylibre.com \
--cc=pmeerw@pmeerw.net \
--cc=tglx@linutronix.de \
--cc=yzhai003@ucr.edu \
--cc=zhiyunq@cs.ucr.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).