Merge branch 'pm-cpufreq-fixes'

rafaeljw · rafaeljw · commit 5b317cbf2bcb · 2019-02-22T10:17:11.000+01:00
* pm-cpufreq-fixes:
  cpufreq: scmi: Fix use-after-free in scmi_cpufreq_exit()
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
@@ -187,8 +187,8 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)
 
 	cpufreq_cooling_unregister(priv->cdev);
 	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
-	kfree(priv);
 	dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
+	kfree(priv);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,8 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)`
`187`	`187`
`188`	`188`	`cpufreq_cooling_unregister(priv->cdev);`
`189`	`189`	`dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);`
`190`		`- kfree(priv);`
`191`	`190`	`dev_pm_opp_remove_all_dynamic(priv->cpu_dev);`
	`191`	`+ kfree(priv);`
`192`	`192`
`193`	`193`	`return 0;`
`194`	`194`	`}`