Merge branch 'pm-cpufreq'

rafaeljw · rafaeljw · commit dee8f20e61ae · 2024-05-21T10:42:58.000+02:00
Merge an amd-pstate driver fix for 6.10-rc1:

 - Fix a memory leak in the exit path of amd-pstate (Peng Ma).

* pm-cpufreq:
  cpufreq: amd-pstate: fix memory leak on CPU EPP exit
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
@@ -1441,6 +1441,13 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 
 static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
 {
+	struct amd_cpudata *cpudata = policy->driver_data;
+
+	if (cpudata) {
+		kfree(cpudata);
+		policy->driver_data = NULL;
+	}
+
 	pr_debug("CPU %d exiting\n", policy->cpu);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1441,6 +1441,13 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)`
`1441`	`1441`
`1442`	`1442`	`static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)`
`1443`	`1443`	`{`
	`1444`	`+ struct amd_cpudata *cpudata = policy->driver_data;`
	`1445`	`+`
	`1446`	`+ if (cpudata) {`
	`1447`	`+ kfree(cpudata);`
	`1448`	`+ policy->driver_data = NULL;`
	`1449`	`+ }`
	`1450`	`+`
`1444`	`1451`	`pr_debug("CPU %d exiting\n", policy->cpu);`
`1445`	`1452`	`return 0;`
`1446`	`1453`	`}`