[PATCH 020/150] hwmon: (sht15) Fix memory leak if regulator_enable() fails

Luis Henriques luis.henriques at canonical.com
Tue Mar 26 15:18:39 UTC 2013 -stable review patch.  If anyone has any objections, please let me know.


From: Ben Hutchings <ben at decadent.org.uk>

Commit 3e78080f8148 ('hwmon: (sht15) Check return value of
regulator_enable()') depends on the use of devm_kmalloc() for automatic
resource cleanup in the failure cases, which was introduced in 3.7.  In
older stable branches, explicit cleanup is needed.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Guenter Roeck <linux at roeck-us.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
 drivers/hwmon/sht15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index eb01802..c689630 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -930,7 +930,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
 		if (ret != 0) {
 				"failed to enable regulator: %d\n", ret);
-			return ret;
+			goto err_free_data;

More information about the kernel-team mailing list