[PATCH] x86/hwmon: don't leak device attribute file from pkgtemp_probe()

[PATCH] x86/hwmon: don't leak device attribute file from pkgtemp_probe()

[Jan Beulich]

While apparently inherited from coretemp source, this particular error
handling cleanup path wasn't copied properly (or perhaps got discarded
intermediately and not re-added properly later).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>

---
 drivers/hwmon/pkgtemp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- linux-2.6.36-rc4/drivers/hwmon/pkgtemp.c	2010-09-13 08:45:03.000000000 +0200
+++ 2.6.36-rc4-x86-pkgtemp-probe-error-path/drivers/hwmon/pkgtemp.c	2010-09-03 17:54:30.000000000 +0200
@@ -224,7 +224,7 @@ static int __devinit pkgtemp_probe(struc
 
 	err = sysfs_create_group(&pdev->dev.kobj, &pkgtemp_group);
 	if (err)
-		goto exit_free;
+		goto exit_dev;
 
 	data->hwmon_dev = hwmon_device_register(&pdev->dev);
 	if (IS_ERR(data->hwmon_dev)) {
@@ -238,6 +238,8 @@ static int __devinit pkgtemp_probe(struc
 
 exit_class:
 	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
+exit_dev:
+	device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
 exit_free:
 	kfree(data);
 exit:

Re: [PATCH] x86/hwmon: don't leak device attribute file from pkgtemp_probe()

[Guenter Roeck]

Jan Beulich <JBeulich <at> novell.com> writes:
> 
> While apparently inherited from coretemp source, this particular error
> handling cleanup path wasn't copied properly (or perhaps got discarded
> intermediately and not re-added properly later).
> 
> Signed-off-by: Jan Beulich <jbeulich <at> novell.com>
> Cc: Fenghua Yu <fenghua.yu <at> intel.com>
> 
> ---
[...]

>  exit_class:
>  	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
> +exit_dev:
> +	device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
>  exit_free:
>  	kfree(data);
>  exit:
> 
The device file should also be deleted in pkgtemp_remove(). Looks like that got
lost as well.

No need to resend; I'll add that myself.

Guenter