summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-17 12:01:58 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-17 12:01:58 -0400
commit6383c59066e311f2fa903a8f31b2e9ce588e5ffa (patch)
treec68ca51d9357478a2f011d6dcfbe8bbb3fedc5be
parent3920c47acf8d94044fb278f6ab9c29613a715cf7 (diff)
downloadlongterm-queue-4.18-6383c59066e311f2fa903a8f31b2e9ce588e5ffa.tar.gz
cpufreq: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch b/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
index 67ddc84..7064702 100644
--- a/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
+++ b/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
@@ -1,4 +1,4 @@
-From e0a12445d1cb186d875410d093a00d215bec6a89 Mon Sep 17 00:00:00 2001
+From 325a6980ed331fcabe7dd5bd074267d8bb6f9805 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Wed, 17 Jul 2019 11:55:04 +0800
Subject: [PATCH] cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()
@@ -12,12 +12,13 @@ Fixes: a9acc26b75f6 ("cpufreq/pasemi: fix possible object reference leak")
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
-index 93f39a1d4c3d..c66f566a854c 100644
+index c7710c149de8..a0620c9ec064 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
-@@ -131,10 +131,18 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -145,10 +145,18 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
int err = -ENODEV;
cpu = of_get_cpu_node(policy->cpu, NULL);
@@ -37,7 +38,7 @@ index 93f39a1d4c3d..c66f566a854c 100644
dn = of_find_compatible_node(NULL, NULL, "1682m-sdc");
if (!dn)
-@@ -171,16 +179,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -185,16 +193,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
}
pr_debug("init cpufreq on CPU %d\n", policy->cpu);
@@ -54,9 +55,9 @@ index 93f39a1d4c3d..c66f566a854c 100644
pr_debug("max clock-frequency is at %u kHz\n", max_freq);
pr_debug("initializing frequency table\n");
-@@ -199,9 +197,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
- cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
- return 0;
+@@ -212,9 +210,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
+
+ return cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
-out_unmap_sdcpwr:
- iounmap(sdcpwr_mapbase);