Drop cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch from older trees

diff --git a/queue-4.19/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch b/queue-4.19/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
deleted file mode 100644 (file)
index 42a3c4d..0000000
--- a/queue-4.19/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b7e59d4a2605da3fa3c1e0cca33feed6b07ce818 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 10:12:20 +0300
-Subject: cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return
- value
-
-From: Anastasia Belova <abelova@astralinux.ru>
-
-[ Upstream commit f661017e6d326ee187db24194cabb013d81bc2a6 ]
-
-cpufreq_cpu_get may return NULL. To avoid NULL-dereference check it
-and return 0 in case of error.
-
-Found by Linux Verification Center (linuxtesting.org) with SVACE.
-
-Fixes: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs")
-Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
-index 541486217984b..1302e1900dcb1 100644
---- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
-+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
-@@ -457,6 +457,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
- static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
- {
-       struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-+      if (!policy)
-+              return 0;
-       struct private_data *priv = policy->driver_data;
- 
-       return brcm_avs_get_frequency(priv->base);
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 73be081a6f89e75d06951befc1362faffdf5f54b..771de686bb9edf81c9d13eb069508113ffb217ec 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -33,7 +33,6 @@ b43-main-fix-use-true-false-for-bool-type.patch
 wifi-b43-stop-correct-queue-in-dma-worker-when-qos-i.patch
 wifi-b43-disable-qos-for-bcm4331.patch
 wifi-mwifiex-debugfs-drop-unnecessary-error-check-fo.patch
-cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
 sock_diag-annotate-data-races-around-sock_diag_handl.patch
 af_unix-annotate-data-race-of-gc_in_progress-in-wait.patch
 wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch

diff --git a/queue-5.4/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch b/queue-5.4/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
deleted file mode 100644 (file)
index 790e0f7..0000000
--- a/queue-5.4/cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf5d74f51a2359a40fe8629cd1659f7a2ad9a9ad Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 10:12:20 +0300
-Subject: cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return
- value
-
-From: Anastasia Belova <abelova@astralinux.ru>
-
-[ Upstream commit f661017e6d326ee187db24194cabb013d81bc2a6 ]
-
-cpufreq_cpu_get may return NULL. To avoid NULL-dereference check it
-and return 0 in case of error.
-
-Found by Linux Verification Center (linuxtesting.org) with SVACE.
-
-Fixes: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs")
-Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
-Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
-index 541486217984b..1302e1900dcb1 100644
---- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
-+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
-@@ -457,6 +457,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv)
- static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)
- {
-       struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-+      if (!policy)
-+              return 0;
-       struct private_data *priv = policy->driver_data;
- 
-       return brcm_avs_get_frequency(priv->base);
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 69a49e96196951f6fdb546d0125e2ce0ce0825b6..c6737e96efcc9ad1679568f0523260354ab1523f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -36,7 +36,6 @@ wifi-b43-disable-qos-for-bcm4331.patch
 wifi-wilc1000-fix-declarations-ordering.patch
 wifi-wilc1000-fix-rcu-usage-in-connect-path.patch
 wifi-mwifiex-debugfs-drop-unnecessary-error-check-fo.patch
-cpufreq-brcmstb-avs-cpufreq-add-check-for-cpufreq_cp.patch
 sock_diag-annotate-data-races-around-sock_diag_handl.patch
 af_unix-annotate-data-race-of-gc_in_progress-in-wait.patch
 net-blackhole_dev-fix-build-warning-for-ethh-set-but.patch