lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: Fix memory leak in set_machine_constraints() error paths

Browse Source 
Properly kfree rdev->constraints in all set_machine_constraints() error paths.
Also properly kfree rdev->constraints in regulator_register() error paths.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Axel Lin
2011-07-15 10:50:43 +08:00
committed by Liam Girdwood
parent 89f425ed5b
commit 1a6958e79f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/regulator/core.c
View File

@@ -794,7 +794,6 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to apply %duV constraint\n", rdev_err(rdev, "failed to apply %duV constraint\n",
rdev->constraints->min_uV); rdev->constraints->min_uV);
rdev->constraints = NULL;
return ret; return ret;
} }
} }
@@ -897,7 +896,6 @@ static int set_machine_constraints(struct regulator_dev *rdev,
ret = suspend_prepare(rdev, rdev->constraints->initial_state); ret = suspend_prepare(rdev, rdev->constraints->initial_state);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to set suspend state\n"); rdev_err(rdev, "failed to set suspend state\n");
rdev->constraints = NULL;
goto out; goto out;
} }
} }
@@ -924,13 +922,15 @@ static int set_machine_constraints(struct regulator_dev *rdev,
ret = ops->enable(rdev); ret = ops->enable(rdev);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to enable\n"); rdev_err(rdev, "failed to enable\n");
rdev->constraints = NULL;
goto out; goto out;
} }
} }
print_constraints(rdev); print_constraints(rdev);
return 0;
out: out:
kfree(rdev->constraints);
rdev->constraints = NULL;
return ret; return ret;
} }
@@ -2701,6 +2701,7 @@ unset_supplies:
unset_regulator_supplies(rdev); unset_regulator_supplies(rdev);
scrub: scrub:
kfree(rdev->constraints);
device_unregister(&rdev->dev); device_unregister(&rdev->dev);
/* device core frees rdev */ /* device core frees rdev */
rdev = ERR_PTR(ret); rdev = ERR_PTR(ret);