AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()

Browse Source 
The cpu variable is still being used in the of_get_property() call
after the of_node_put() call, which may result in use-after-free.

Fixes: a9acc26b75 ("cpufreq/pasemi: fix possible object reference leak")
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Wen Yang 2019-07-17 11:55:04 +08:00 committed by Rafael J. Wysocki
parent 5f9e832c13
commit e0a12445d1
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/cpufreq/pasemi-cpufreq.c
View File

@ -131,11 +131,19 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
int err = -ENODEV; int err = -ENODEV;
cpu = of_get_cpu_node(policy->cpu, NULL); cpu = of_get_cpu_node(policy->cpu, NULL);
of_node_put(cpu);
if (!cpu) if (!cpu)
goto out; goto out;
max_freqp = of_get_property(cpu, "clock-frequency", NULL);
of_node_put(cpu);
if (!max_freqp) {
err = -EINVAL;
goto out;
}
/* we need the freq in kHz */
max_freq = *max_freqp / 1000;
dn = of_find_compatible_node(NULL, NULL, "1682m-sdc"); dn = of_find_compatible_node(NULL, NULL, "1682m-sdc");
if (!dn) if (!dn)
dn = of_find_compatible_node(NULL, NULL, dn = of_find_compatible_node(NULL, NULL,
@ -171,16 +179,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
} }
pr_debug("init cpufreq on CPU %d\n", policy->cpu); pr_debug("init cpufreq on CPU %d\n", policy->cpu);
max_freqp = of_get_property(cpu, "clock-frequency", NULL);
if (!max_freqp) {
err = -EINVAL;
goto out_unmap_sdcpwr;
}
/* we need the freq in kHz */
max_freq = *max_freqp / 1000;
pr_debug("max clock-frequency is at %u kHz\n", max_freq); pr_debug("max clock-frequency is at %u kHz\n", max_freq);
pr_debug("initializing frequency table\n"); pr_debug("initializing frequency table\n");
@ -199,9 +197,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency()); cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
return 0; return 0;
out_unmap_sdcpwr:
iounmap(sdcpwr_mapbase);
out_unmap_sdcasr: out_unmap_sdcasr:
iounmap(sdcasr_mapbase); iounmap(sdcasr_mapbase);
out: out: