Unverified Commit e1fcb05e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12017 cppc_cpufreq: Fix possible null pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Mingrui <liumingrui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3VG7WV4DGDBZREY4MIUBUVJ3FSROTS3H/ 
 
https://gitee.com/openeuler/kernel/issues/IA74DQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/12017

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 90c47c4a 78bb5d20

drivers/cpufreq/cppc_cpufreq.c

+12 −2
Original line number Diff line number Diff line
@@ -878,10 +878,15 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) 
{

	struct fb_ctr_pair fb_ctrs = { .cpu = cpu, };

	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);

	struct cppc_cpudata *cpu_data = policy->driver_data;

	struct cppc_cpudata *cpu_data;

	u64 delivered_perf;

	int ret;



	if (!policy)

		return -ENODEV;



	cpu_data = policy->driver_data;



	cpufreq_cpu_put(policy);



	if (cpu_has_amu_feat(cpu))
@@ -961,10 +966,15 @@ static struct cpufreq_driver cppc_cpufreq_driver = { 
static unsigned int hisi_cppc_cpufreq_get_rate(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);

	struct cppc_cpudata *cpu_data = policy->driver_data;

	struct cppc_cpudata *cpu_data;

	u64 desired_perf;

	int ret;



	if (!policy)

		return -ENODEV;



	cpu_data = policy->driver_data;



	cpufreq_cpu_put(policy);



	ret = cppc_get_desired_perf(cpu, &desired_perf);