Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32260d94 authored by Guenter Roeck's avatar Guenter Roeck Committed by Guenter Roeck
Browse files

hwmon: (w83627ehf) Fix memory leak in probe function 



The driver probe function leaked memory if creating the cpu0_vid attribute file
failed. Fix by converting the driver to use devm_kzalloc.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org # 2.6.32+
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent 33fa9b62

drivers/hwmon/w83627ehf.c

+3 −4
Original line number Diff line number Diff line
@@ -2004,7 +2004,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) 
		goto exit;

	}



	data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(struct w83627ehf_data),

			    GFP_KERNEL);

	if (!data) {

		err = -ENOMEM;

		goto exit_release;
@@ -2493,9 +2494,8 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) 


exit_remove:

	w83627ehf_device_remove_files(dev);

	kfree(data);

	platform_set_drvdata(pdev, NULL);

exit_release:

	platform_set_drvdata(pdev, NULL);

	release_region(res->start, IOREGION_LENGTH);

exit:

	return err;
@@ -2509,7 +2509,6 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev) 
	w83627ehf_device_remove_files(&pdev->dev);

	release_region(data->addr, IOREGION_LENGTH);

	platform_set_drvdata(pdev, NULL);

	kfree(data);



	return 0;

}