2020-08-02 03:27:38

by Axel Lin

[permalink] [raw]
Subject: [PATCH] regulator: cros-ec-regulator: Add NULL test for devm_kmemdup call

Fix possible NULL pointer dereference.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/cros-ec-regulator.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/regulator/cros-ec-regulator.c b/drivers/regulator/cros-ec-regulator.c
index 3117bbd2826b..eb3fc1db4edc 100644
--- a/drivers/regulator/cros-ec-regulator.c
+++ b/drivers/regulator/cros-ec-regulator.c
@@ -170,6 +170,9 @@ static int cros_ec_regulator_init_info(struct device *dev,
data->voltages_mV =
devm_kmemdup(dev, resp.voltages_mv,
sizeof(u16) * data->num_voltages, GFP_KERNEL);
+ if (!data->voltages_mV)
+ return -ENOMEM;
+
data->desc.n_voltages = data->num_voltages;

/* Make sure the returned name is always a valid string */
--
2.25.1


2020-08-03 15:56:17

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regulator: cros-ec-regulator: Add NULL test for devm_kmemdup call

On Sun, 2 Aug 2020 11:25:09 +0800, Axel Lin wrote:
> Fix possible NULL pointer dereference.

Applied to

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

Thanks!

[1/1] regulator: cros-ec-regulator: Add NULL test for devm_kmemdup call
commit: 3eccc72b0c3462a6047aa0f85c50263a0a58b001

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