Skip to contentSkip to conversation

cpufreq: intel_pstate: Fix NULL pointer dereference in update_cpu_qos_request()

PATCH Applied David Arcari 2 participants 2 messages Feb 24

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpufreq: intel_pstate: Fix NULL pointer dereference in update_cpu_qos_request()

The update_cpu_qos_request() function attempts to initialize the 'freq' variable by dereferencing 'cpudata' before verifying if the 'policy' is valid.

This issue occurs on systems booted with the "nosmt" parameter, where all_cpu_data[cpu] is NULL for the SMT sibling threads. As a result, any call to update_qos_requests() will result in a NULL pointer dereference as the code will attempt to access pstate.turbo_freq using the NULL cpudata pointer.

Fix this by deferring the 'freq' assignment until after the policy and driver_data have been validated.

Fixes ae1bdd23b99f ("cpufreq: intel_pstate: Adjust frequency percentage computations")
---
 drivers/cpufreq/intel_pstate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/cpufreq/intel_pstate.c +3 -1
index a48af3540c74..bdc37080d319 100644
@@ -1647,8 +1647,8 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b,
 static void update_cpu_qos_request(int cpu, enum freq_qos_req_type type)
 {
 	struct cpudata *cpudata = all_cpu_data[cpu];
-	unsigned int freq = cpudata->pstate.turbo_freq;
 	struct freq_qos_request *req;
+	unsigned int freq;
 
 	struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
 	if (!policy)
@@ -1661,6 +1661,8 @@ static void update_cpu_qos_request(int cpu, enum freq_qos_req_type type)
 	if (hwp_active)
 		intel_pstate_get_hwp_cap(cpudata);
 
+	freq = cpudata->pstate.turbo_freq;
+
 	if (type == FREQ_QOS_MIN) {
 		freq = DIV_ROUND_UP(freq * global.min_perf_pct, 100);
 	} else {
Signature · 1 line
2.52.0
maintainer Applied
#1 lore raw
Quoted 11 lines · David Arcari

The update_cpu_qos_request() function attempts to initialize the 'freq' variable by dereferencing 'cpudata' before verifying if the 'policy' is valid.

This issue occurs on systems booted with the "nosmt" parameter, where all_cpu_data[cpu] is NULL for the SMT sibling threads. As a result, any call to update_qos_requests() will result in a NULL pointer dereference as the code will attempt to access pstate.turbo_freq using the NULL cpudata pointer.

Quoted 7 lines

Fix this by deferring the 'freq' assignment until after the policy and driver_data have been validated.

Fixes ae1bdd23b99f ("cpufreq: intel_pstate: Adjust frequency percentage computations")

Applied as 7.0-rc material, thanks!

Quoted 30 lines
---
 drivers/cpufreq/intel_pstate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/cpufreq/intel_pstate.c +3 -2
index a48af3540c74..bdc37080d319 100644
@@ -1647,8 +1647,8 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b,
 static void update_cpu_qos_request(int cpu, enum freq_qos_req_type type)
 {
        struct cpudata *cpudata = all_cpu_data[cpu];
-       unsigned int freq = cpudata->pstate.turbo_freq;
        struct freq_qos_request *req;
+       unsigned int freq;
 
        struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
        if (!policy)
@@ -1661,6 +1661,8 @@ static void update_cpu_qos_request(int cpu, enum freq_qos_req_type type)
        if (hwp_active)
                intel_pstate_get_hwp_cap(cpudata);
 
+       freq = cpudata->pstate.turbo_freq;
+
        if (type == FREQ_QOS_MIN) {
                freq = DIV_ROUND_UP(freq * global.min_perf_pct, 100);
        } else {
--

2.52.0