Skip to contentSkip to conversation

regulator: core: Release coupled_rdevs on regulator_init_coupling() error

PATCH In review Dmitry Osipenko 2 participants 4 messages Oct 25, 2019 – Oct 28, 2019 Voltage and current regulator framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 regulator: core: Release coupled_rdevs on regulator_init_coupling() error

This patch fixes memory leak which should happen if regulator's coupling fails to initialize.

Fixes d8ca7d184b33 ("regulator: core: Introduce API for regulators coupling customization")
---
 drivers/regulator/core.c | 1 +
 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
index a46be221dbdc..51ce280c1ce1 100644
@@ -5198,6 +5198,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
 	regulator_remove_coupling(rdev);
 	mutex_unlock(&regulator_list_mutex);
 wash:
+	kfree(rdev->coupling_desc.coupled_rdevs);
 	kfree(rdev->constraints);
 	mutex_lock(&regulator_list_mutex);
 	regulator_ena_gpio_free(rdev);
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 regulator: core: Allow generic coupling only for always-on regulators

The generic voltage balancer doesn't work correctly if one of regulator couples turns off. Currently there are no users in kernel for that case, although let's explicitly show that this case is unsupported for those who will try to use that feature.

---
 drivers/regulator/core.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/regulator/core.c +6 -0
index 51ce280c1ce1..970905124382 100644
@@ -4963,6 +4963,12 @@ static int generic_coupler_attach(struct regulator_coupler *coupler,
 		return -EPERM;
 	}
 
+	if (!rdev->constraints->always_on) {
+		rdev_err(rdev,
+			 "Coupling of a non always-on regulator is unimplemented\n");
+		return -ENOTSUPP;
+	}
+
 	return 0;
 }
 
Signature · 1 line
2.23.0
maintainer
#2 lore raw

Applied "regulator: core: Allow generic coupling only for always-on regulators" to the regulator tree

The patch

regulator: core: Allow generic coupling only for always-on regulators

has been applied to the regulator tree at

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

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

From e381bfe45a891a5894465f072c5bbf3ed3e33b8a Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <[email protected]>
Date: Fri, 25 Oct 2019 03:22:40 +0300
Subject: [PATCH] regulator: core: Allow generic coupling only for always-on
regulators

The generic voltage balancer doesn't work correctly if one of regulator couples turns off. Currently there are no users in kernel for that case, although let's explicitly show that this case is unsupported for those who will try to use that feature.

---
 drivers/regulator/core.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/regulator/core.c +6 -0
index a46be221dbdc..a5b2a9b02108 100644
@@ -4963,6 +4963,12 @@ static int generic_coupler_attach(struct regulator_coupler *coupler,
 		return -EPERM;
 	}
 
+	if (!rdev->constraints->always_on) {
+		rdev_err(rdev,
+			 "Coupling of a non always-on regulator is unimplemented\n");
+		return -ENOTSUPP;
+	}
+
 	return 0;
 }
 
Signature · 1 line
2.20.1
maintainer
#3 lore raw

Applied "regulator: core: Release coupled_rdevs on regulator_init_coupling() error" to the regulator tree

In reply to Dmitry Osipenko

The patch

regulator: core: Release coupled_rdevs on regulator_init_coupling() error

has been applied to the regulator tree at

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

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

From 26c2c997aa1a6c5522f6619910ba025e53e69763 Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <[email protected]>
Date: Fri, 25 Oct 2019 03:22:39 +0300
Subject: [PATCH] regulator: core: Release coupled_rdevs on
regulator_init_coupling() error

This patch fixes memory leak which should happen if regulator's coupling fails to initialize.

Fixes d8ca7d184b33 ("regulator: core: Introduce API for regulators coupling customization")
---
 drivers/regulator/core.c | 1 +
 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
index a46be221dbdc..51ce280c1ce1 100644
@@ -5198,6 +5198,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
 	regulator_remove_coupling(rdev);
 	mutex_unlock(&regulator_list_mutex);
 wash:
+	kfree(rdev->coupling_desc.coupled_rdevs);
 	kfree(rdev->constraints);
 	mutex_lock(&regulator_list_mutex);
 	regulator_ena_gpio_free(rdev);
Signature · 1 line
2.20.1