mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-23 16:53:58 -05:00
cpuidle: fix number of initialized/destroyed states
Commit bf4d1b5ddb
(cpuidle: support
multiple drivers) changed the number of initialized state kobjects
in cpuidle_add_state_sysfs() from device->state_count to
drv->state_count, but left device->state_count in
cpuidle_remove_state_sysfs(). The values of these two fields may be
different, in which case a NULL pointer dereference may happen in
cpuidle_remove_state_sysfs(), for example. Fix this problem by making
cpuidle_add_state_sysfs() use device->state_count too (which restores
the original behavior of it).
[rjw: Changelog]
Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
9931faca02
commit
392370e7aa
1 changed files with 1 additions and 1 deletions
|
@ -374,7 +374,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device)
|
||||||
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(device);
|
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(device);
|
||||||
|
|
||||||
/* state statistics */
|
/* state statistics */
|
||||||
for (i = 0; i < drv->state_count; i++) {
|
for (i = 0; i < device->state_count; i++) {
|
||||||
kobj = kzalloc(sizeof(struct cpuidle_state_kobj), GFP_KERNEL);
|
kobj = kzalloc(sizeof(struct cpuidle_state_kobj), GFP_KERNEL);
|
||||||
if (!kobj)
|
if (!kobj)
|
||||||
goto error_state;
|
goto error_state;
|
||||||
|
|
Loading…
Add table
Reference in a new issue