thermal: sysfs: Fix cooling_device_stats_setup() error code path
PATCH 1/1 thermal: sysfs: Fix cooling_device_stats_setup() error code path
From: Rafael J. Wysocki <[email protected]>
If cooling_device_stats_setup() fails to create the stats object, it must clear the last slot in cooling_device_attr_groups that was initially empty (so as to make it possible to add stats attributes to the cooling device attribute groups).
Failing to do so may cause the stats attributes to be created by mistake for a device that doesn't have a stats object, because the slot in question might be populated previously during the registration of another cooling device.
Fixes 8ea229511e06 ("thermal: Add cooling device's statistics in sysfs")
Reported-by Di Shen <[email protected]>
Tested-by Di Shen <[email protected]>
Cc 4.17+ <[email protected]> # 4.17+
Signed-off-by Rafael J. Wysocki <[email protected]>
--- drivers/thermal/thermal_sysfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/thermal/thermal_sysfs.c +7 -3
@@ -813,12 +813,13 @@ static const struct attribute_group coolstatic void cooling_device_stats_setup (struct thermal_cooling_device *cdev) { +const struct attribute_group *stats_attr_group =NULL ;struct cooling_dev_stats *stats;unsigned long states;int var;if (cdev->ops->get_max_state (cdev, &states)) -return ; + goto out; states++;/* Total number of states is highest state + 1 */
@@ -828,7 +829,7 @@ static void cooling_device_stats_setup(s stats =kzalloc (var,GFP_KERNEL );if (!stats) -return ; + goto out; stats->time_in_state = (ktime_t *)(stats +1 ); stats->trans_table = (unsigned int *)(stats->time_in_state + states);
@@ -838,9 +839,12 @@ static void cooling_device_stats_setup(sspin_lock_init (&stats->lock); + stats_attr_group = &cooling_device_stats_attr_group; + +out:/* Fill the empty slot left in cooling_device_attr_groups */ var =ARRAY_SIZE (cooling_device_attr_groups) -2 ; - cooling_device_attr_groups[var] = &cooling_device_stats_attr_group; + cooling_device_attr_groups[var] = stats_attr_group; }static void cooling_device_stats_destroy (struct thermal_cooling_device *cdev)