Thread (3 messages) 3 messages, 3 authors, 2019-10-01

Re: [PATCH] iio: adc: imx25-gcq: Variable could be uninitialized if regmap_read() fails

From: Marco Felsch <hidden>
Date: 2019-09-30 07:44:30
Also in: linux-iio, lkml

Hi Yizhuo,

thanks for your patch.

On 19-09-27 17:28, Yizhuo wrote:
In function mx25_gcq_irq(), local variable "stats" could
be uninitialized if function regmap_read() returns -EINVAL.
However, this value is used in if statement, which is
potentially unsafe. The same case applied to the variable
"data" in function mx25_gcq_get_raw_value() in the same file.
IMHO the commit header should be something like: "iio: adc: imx25-gcq:
fix uninitialized variable usage"...

and please add a fixes tag.
quoted hunk ↗ jump to hunk
Signed-off-by: Yizhuo <redacted>
---
 drivers/iio/adc/fsl-imx25-gcq.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c
index df19ecae52f7..dbf3e8e85aba 100644
--- a/drivers/iio/adc/fsl-imx25-gcq.c
+++ b/drivers/iio/adc/fsl-imx25-gcq.c
@@ -74,7 +74,10 @@ static irqreturn_t mx25_gcq_irq(int irq, void *data)
 	struct mx25_gcq_priv *priv = data;
 	u32 stats;
 
-	regmap_read(priv->regs, MX25_ADCQ_SR, &stats);
+	int ret = regmap_read(priv->regs, MX25_ADCQ_SR, &stats);
Please don't do this. First declare the variable and then use it.

Regards,
  Marco
quoted hunk ↗ jump to hunk
+
+	if (ret)
+		return ret;
 
 	if (stats & MX25_ADCQ_SR_EOQ) {
 		regmap_update_bits(priv->regs, MX25_ADCQ_MR,
@@ -121,7 +124,10 @@ static int mx25_gcq_get_raw_value(struct device *dev,
 		return -ETIMEDOUT;
 	}
 
-	regmap_read(priv->regs, MX25_ADCQ_FIFO, &data);
+	int ret = regmap_read(priv->regs, MX25_ADCQ_FIFO, &data);
+
+	if (ret)
+		return ret;
 
 	*val = MX25_ADCQ_FIFO_DATA(data);
 
-- 
2.17.1

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help