From: Anastasia Belova abelova@astralinux.ru

mainline inclusion from mainline-v6.9-rc1 commit f661017e6d326ee187db24194cabb013d81bc2a6 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9N6Q0 CVE: CVE-2024-27051

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

--------------------------------

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 Conflicts: drivers/cpufreq/brcmstb-avs-cpufreq.c Signed-off-by: Liao Chen liaochen4@huawei.com --- 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 e6f9cbe5835f..c28ec3060469 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -453,6 +453,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);