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")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/regulator/da9121-regulator.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-regulator.c
index db1c2cc838bc..e4fc3a7cd5d8 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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
Acked-by: Adam Ward <[email protected]>
> -----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")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/regulator/da9121-regulator.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-
> regulator.c
> index db1c2cc838bc..e4fc3a7cd5d8 100644
> --- a/drivers/regulator/da9121-regulator.c
> +++ b/drivers/regulator/da9121-regulator.c
> @@ -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
On Mon, 7 Dec 2020 20:55:44 +0300, Dan Carpenter wrote:
> 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