Commit 943bdd0c authored by Colin Ian King's avatar Colin Ian King Committed by Rafael J. Wysocki

cpufreq: powernow-k8: pass policy rather than use cpufreq_cpu_get()

Currently there is an unlikely case where cpufreq_cpu_get() returns a
NULL policy and this will cause a NULL pointer dereference later on.

Fix this by passing the policy to transition_frequency_fidvid() from
the caller and hence eliminating the need for the cpufreq_cpu_get()
and cpufreq_cpu_put().

Thanks to Viresh Kumar for suggesting the fix.

Addresses-Coverity: ("Dereference null return")
Fixes: b43a7ffb ("cpufreq: Notify all policy->cpus in cpufreq_notify_transition()")
Suggested-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 17ffd358
...@@ -878,9 +878,9 @@ static int get_transition_latency(struct powernow_k8_data *data) ...@@ -878,9 +878,9 @@ static int get_transition_latency(struct powernow_k8_data *data)
/* Take a frequency, and issue the fid/vid transition command */ /* Take a frequency, and issue the fid/vid transition command */
static int transition_frequency_fidvid(struct powernow_k8_data *data, static int transition_frequency_fidvid(struct powernow_k8_data *data,
unsigned int index) unsigned int index,
struct cpufreq_policy *policy)
{ {
struct cpufreq_policy *policy;
u32 fid = 0; u32 fid = 0;
u32 vid = 0; u32 vid = 0;
int res; int res;
...@@ -912,9 +912,6 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, ...@@ -912,9 +912,6 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
freqs.old = find_khz_freq_from_fid(data->currfid); freqs.old = find_khz_freq_from_fid(data->currfid);
freqs.new = find_khz_freq_from_fid(fid); freqs.new = find_khz_freq_from_fid(fid);
policy = cpufreq_cpu_get(smp_processor_id());
cpufreq_cpu_put(policy);
cpufreq_freq_transition_begin(policy, &freqs); cpufreq_freq_transition_begin(policy, &freqs);
res = transition_fid_vid(data, fid, vid); res = transition_fid_vid(data, fid, vid);
cpufreq_freq_transition_end(policy, &freqs, res); cpufreq_freq_transition_end(policy, &freqs, res);
...@@ -969,7 +966,7 @@ static long powernowk8_target_fn(void *arg) ...@@ -969,7 +966,7 @@ static long powernowk8_target_fn(void *arg)
powernow_k8_acpi_pst_values(data, newstate); powernow_k8_acpi_pst_values(data, newstate);
ret = transition_frequency_fidvid(data, newstate); ret = transition_frequency_fidvid(data, newstate, pol);
if (ret) { if (ret) {
pr_err("transition frequency failed\n"); pr_err("transition frequency failed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment