stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-13 11:07:46 +10:00
Code Issues Releases Wiki Activity

cpufreq: Init policy->rwsem before it may be possibly used

Browse Source 
[ Upstream commit d1378d1d7e ]

In cpufreq_policy_put_kobj(), policy->rwsem is used. But in
cpufreq_policy_alloc(), if freq_qos_add_notifier() returns an error, error
path via err_kobj_remove or err_min_qos_notifier will be reached and
cpufreq_policy_put_kobj() will be called before policy->rwsem is
initialized. Thus, the calling of init_rwsem() should be moved to where
before these two error paths can be reached.

Fixes: 67d874c3b2 ("cpufreq: Register notifiers with the PM QoS framework")
Signed-off-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Link: https://patch.msgid.link/20250709104145.2348017-3-zhenglifeng1@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lifeng Zheng 2025-07-09 18:41:43 +08:00 committed by Greg Kroah-Hartman
parent 2bfbee12d8
commit ba84ad7330
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cpufreq/cpufreq.c
View File

@ -1227,6 +1227,8 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
goto err_free_real_cpus; goto err_free_real_cpus;
} }
init_rwsem(&policy->rwsem);
freq_constraints_init(&policy->constraints); freq_constraints_init(&policy->constraints);
policy->nb_min.notifier_call = cpufreq_notifier_min; policy->nb_min.notifier_call = cpufreq_notifier_min;
@ -1249,7 +1251,6 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
} }
INIT_LIST_HEAD(&policy->policy_list); INIT_LIST_HEAD(&policy->policy_list);
init_rwsem(&policy->rwsem);
spin_lock_init(&policy->transition_lock); spin_lock_init(&policy->transition_lock);
init_waitqueue_head(&policy->transition_wait); init_waitqueue_head(&policy->transition_wait);
INIT_WORK(&policy->update, handle_update); INIT_WORK(&policy->update, handle_update);