Re: [PATCH 6.6] cpufreq: amd-pstate: add check for cpufreq_cpu_get's return value

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi!

If I'm not mistaken, the line From: should contain the name of the original
commit author. Also I’ve already sent same back-port [1].
However, I didn’t get an answer yet.

[1] https://lore.kernel.org/lkml/20241106182000.40167-2-abelova@xxxxxxxxxxxxx/

Anastasia Belova

15.11.2024 11:33, Xiangyu Chen пишет:
From: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxx>

[ Upstream commit 5493f9714e4cdaf0ee7cec15899a231400cb1a9f ]

cpufreq_cpu_get may return NULL. To avoid NULL-dereference check it
and return in case of error.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Anastasia Belova <abelova@xxxxxxxxxxxxx>
Reviewed-by: Perry Yuan <perry.yuan@xxxxxxx>
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
[Xiangyu:  Bp to fix CVE: CVE-2024-50009 resolved minor conflicts]
Signed-off-by: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxx>
---
  drivers/cpufreq/amd-pstate.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 8c16d67b98bf..0fc5495c935a 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -579,9 +579,14 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
  	unsigned long max_perf, min_perf, des_perf,
  		      cap_perf, lowest_nonlinear_perf, max_freq;
  	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-	struct amd_cpudata *cpudata = policy->driver_data;
+	struct amd_cpudata *cpudata;
  	unsigned int target_freq;
+ if (!policy)
+		return;
+
+	cpudata = policy->driver_data;
+
  	if (policy->min != cpudata->min_limit_freq || policy->max != cpudata->max_limit_freq)
  		amd_pstate_update_min_max_limit(policy);




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux