cpuidle: Fix three reference count leaks
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Previous commit "b8eb718348b8" fixed a similar problem. Signed-off-by: Qiushi Wu <wu000273@umn.edu> [ rjw: Subject ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
a871be6b8e
commit
c343bf1ba5
@ -484,7 +484,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)
|
|||||||
ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle,
|
ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle,
|
||||||
&kdev->kobj, "state%d", i);
|
&kdev->kobj, "state%d", i);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
kfree(kobj);
|
kobject_put(&kobj->kobj);
|
||||||
goto error_state;
|
goto error_state;
|
||||||
}
|
}
|
||||||
cpuidle_add_s2idle_attr_group(kobj);
|
cpuidle_add_s2idle_attr_group(kobj);
|
||||||
@ -615,7 +615,7 @@ static int cpuidle_add_driver_sysfs(struct cpuidle_device *dev)
|
|||||||
ret = kobject_init_and_add(&kdrv->kobj, &ktype_driver_cpuidle,
|
ret = kobject_init_and_add(&kdrv->kobj, &ktype_driver_cpuidle,
|
||||||
&kdev->kobj, "driver");
|
&kdev->kobj, "driver");
|
||||||
if (ret) {
|
if (ret) {
|
||||||
kfree(kdrv);
|
kobject_put(&kdrv->kobj);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -709,7 +709,7 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)
|
|||||||
error = kobject_init_and_add(&kdev->kobj, &ktype_cpuidle, &cpu_dev->kobj,
|
error = kobject_init_and_add(&kdev->kobj, &ktype_cpuidle, &cpu_dev->kobj,
|
||||||
"cpuidle");
|
"cpuidle");
|
||||||
if (error) {
|
if (error) {
|
||||||
kfree(kdev);
|
kobject_put(&kdev->kobj);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user