github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thermal: core: call put_device() only after device_register() fails

Browse Source 
put_device() shouldn't be called before a prior call to
device_register(). __thermal_cooling_device_register() doesn't follow
that properly and needs fixing. Also
thermal_cooling_device_destroy_sysfs() is getting called unnecessarily
on few error paths.

Fix all this by placing the calls at the right place.

Based on initial work done by Caleb Connolly.

Fixes: 4748f9687c ("thermal: core: fix some possible name leaks in error paths")
Fixes: c408b3d1d9 ("thermal: Validate new state in cur_state_store()")
Reported-by: Caleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Frank Rowand <frowand.list@gmail.com>
Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
Tested-by: Caleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar 2023-01-18 14:08:24 +05:30 committed by Rafael J. Wysocki
parent 5dc4c995db
commit 6c54b7bc8a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/thermal/thermal_core.c
View File

@ -909,15 +909,20 @@ __thermal_cooling_device_register(struct device_node *np,
cdev->devdata = devdata; cdev->devdata = devdata;
ret = cdev->ops->get_max_state(cdev, &cdev->max_state); ret = cdev->ops->get_max_state(cdev, &cdev->max_state);
if (ret) if (ret) {
goto out_kfree_type; kfree(cdev->type);
goto out_ida_remove;
}
thermal_cooling_device_setup_sysfs(cdev); thermal_cooling_device_setup_sysfs(cdev);
ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id); ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id);
if (ret) { if (ret) {
kfree(cdev->type);
thermal_cooling_device_destroy_sysfs(cdev); thermal_cooling_device_destroy_sysfs(cdev);
goto out_kfree_type; goto out_ida_remove;
} }
ret = device_register(&cdev->device); ret = device_register(&cdev->device);
if (ret) if (ret)
goto out_kfree_type; goto out_kfree_type;
@ -943,6 +948,8 @@ __thermal_cooling_device_register(struct device_node *np,
thermal_cooling_device_destroy_sysfs(cdev); thermal_cooling_device_destroy_sysfs(cdev);
kfree(cdev->type); kfree(cdev->type);
put_device(&cdev->device); put_device(&cdev->device);
/* thermal_release() takes care of the rest */
cdev = NULL; cdev = NULL;
out_ida_remove: out_ida_remove:
ida_free(&thermal_cdev_ida, id); ida_free(&thermal_cdev_ida, id);