Skip to contentSkip to conversation

regulator: da9121: Potential Oops in da9121_assign_chip_model()

PATCH In review Dan Carpenter 3 participants 3 messages Dec 7, 2020 – Dec 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: da9121: Potential Oops in da9121_assign_chip_model()

There is a missing "return ret;" on this error path so we call "da9121_check_device_type(i2c, chip);" which will end up dereferencing "chip->regmap" and lead to an Oops.

Fixes c860476b9e3a ("regulator: da9121: Add device variant regmaps")
---
 drivers/regulator/da9121-regulator.c | 1 +
 1 file changed, 1 insertion(+)
drivers/regulator/da9121-regulator.c +1 -0
index db1c2cc838bc..e4fc3a7cd5d8 100644
@@ -915,6 +915,7 @@ static int da9121_assign_chip_model(struct i2c_client *i2c,
 		ret = PTR_ERR(chip->regmap);
 		dev_err(chip->dev, "Failed to configure a register map: %d\n",
 			ret);
+		return ret;
 	}
 
 	ret = da9121_check_device_type(i2c, chip);
Signature · 1 line
2.29.2
Acked-by on v1 1/1
#1 lore raw
Quoted 37 lines

-----Original Message-----
From: Dan Carpenter <[email protected]>
Sent: 07 December 2020 17:56
To: Support Opensource <[email protected]>; Adam Ward <[email protected]>
Cc: Liam Girdwood <[email protected]>; Mark Brown <[email protected]>; [email protected]; kernel- [email protected]
Subject: [PATCH] regulator: da9121: Potential Oops in da9121_assign_chip_model()

There is a missing "return ret;" on this error path so we call "da9121_check_device_type(i2c, chip);" which will end up dereferencing "chip->regmap" and lead to an Oops.

Fixes c860476b9e3a ("regulator: da9121: Add device variant regmaps")
---
 drivers/regulator/da9121-regulator.c | 1 +
 1 file changed, 1 insertion(+)
drivers/regulator/da9121- renamed from drivers/regulator/da9121-regulator.c +0 -0

regulator.c
index db1c2cc838bc..e4fc3a7cd5d8 100644

drivers/regulator/da9121-regulator.c +1 -0
@@ -915,6 +915,7 @@ static int da9121_assign_chip_model(struct i2c_client
 *i2c,
 		ret = PTR_ERR(chip->regmap);
 		dev_err(chip->dev, "Failed to configure a register map: %d\n",
 			ret);
+		return ret;
 	}
 

ret = da9121_check_device_type(i2c, chip);
--
2.29.2

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 3 lines · Dan Carpenter

There is a missing "return ret;" on this error path so we call "da9121_check_device_type(i2c, chip);" which will end up dereferencing "chip->regmap" and lead to an Oops.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: da9121: Potential Oops in da9121_assign_chip_model()

      commit: 8db06423e079b1f6c0657e5bebda0006acf75c3c

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark