hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()
This commit is contained in:
Rafael J. Wysocki 2019-07-25 10:46:07 +02:00
parent c528adefd6 e0a12445d1
commit fdc7570157
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: