Skip to contentSkip to conversation

iio: adc: mt6359: fix unchecked return value in mt6358_read_imp

PATCH Superseded Salah Triki 2 participants 2 messages Apr 27

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 iio: adc: mt6359: fix unchecked return value in mt6358_read_imp

In mt6358_read_imp(), the variable val_v is passed to regmap_read() but the return value is not checked. If the read fails, val_v remains uninitialized and its random stack content is subsequently reported as a measurement result.

Initialize val_v to zero to ensure a predictable value is reported in case of bus failure and to prevent potential stack data leakage. This also satisfies static analyzers that might otherwise flag the variable as used uninitialized.

Fixes 3587914bf61 ("iio: adc: Add support for MediaTek MT6357/8/9 Auxiliary ADC")

---
Changes in v3:
- Initialize val_v to zero at declaration instead of checking regmap_read() return value, as suggested by Jonathan Cameron and Andy Shevchenko.
- Update commit message to reflect this new approach

Changes in v2:
- Added Fixes tag.
- Re-examined the entire driver for unchecked regmap operations. While several regmap_write() and regmap_set_bits() calls also ignore return values, I focused on this specific regmap_read() in mt6358_read_imp() because it leads to an uninitialized variable usage (val_v). This makes this fix critical for reporting correct data to userspace

 drivers/iio/adc/mt6359-auxadc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/mt6359-auxadc.c +1 -1
index 6b9ed9b1fde2..0e52effa55db 100644
@@ -489,7 +489,7 @@ static int mt6358_read_imp(struct mt6359_auxadc *adc_dev,
 	const struct mtk_pmic_auxadc_info *cinfo = adc_dev->chip_info;
 	struct regmap *regmap = adc_dev->regmap;
 	u16 reg_adc0 = cinfo->regs[PMIC_AUXADC_ADC0];
-	u32 val_v;
+	u32 val_v = 0;
 	int ret;
 
 	ret = mt6358_start_imp_conv(adc_dev, chan);
Signature · 1 line
2.43.0
#1 lore raw
Quoted 9 lines · Salah Triki

In mt6358_read_imp(), the variable val_v is passed to regmap_read() but the return value is not checked. If the read fails, val_v remains uninitialized and its random stack content is subsequently reported as a measurement result.

Initialize val_v to zero to ensure a predictable value is reported in case of bus failure and to prevent potential stack data leakage. This also satisfies static analyzers that might otherwise flag the variable as used uninitialized.

...

drivers/iio/adc/mt6359-auxadc.c static int mt6358_read_imp(struct mt6359_auxadc *adc_dev, · line 492

Quoted 5 lines
drivers/iio/adc/mt6359-auxadc.c +1 -1
 	const struct mtk_pmic_auxadc_info *cinfo = adc_dev->chip_info;
 	struct regmap *regmap = adc_dev->regmap;
 	u16 reg_adc0 = cinfo->regs[PMIC_AUXADC_ADC0];
-	u32 val_v;
+	u32 val_v = 0;

This is hard to maintain. Better to assign it just immediately before the first use.

Quoted 1 line

int ret;

Otherwise, LGTM.

Signature · 2 lines
With Best Regards,
Andy Shevchenko