Commit d9b5acae authored by Gabor Juhos's avatar Gabor Juhos Committed by openeuler-sync-bot
Browse files

clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays 

stable inclusion
from stable-v5.10.215
commit 3ff4a0f6a8f0ad4b4ee9e908bdfc3cacb7be4060
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5N3
CVE: CVE-2024-26965

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3ff4a0f6a8f0ad4b4ee9e908bdfc3cacb7be4060



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

[ Upstream commit e2c02a85bf53ae86d79b5fccf0a75ac0b78e0c96 ]

The frequency table arrays are supposed to be terminated with an
empty element. Add such entry to the end of the arrays where it
is missing in order to avoid possible out-of-bound access when
the table is traversed by functions like qcom_find_freq() or
qcom_find_freq_floor().

Only compile tested.

Fixes: d8b21201 ("clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)")
Signed-off-by: default avatarGabor Juhos <j4g8y7@gmail.com>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240229-freq-table-terminator-v1-7-074334f0905c@gmail.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
(cherry picked from commit 5acf7346)
parent 2e809f5c

drivers/clk/qcom/mmcc-msm8974.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = { 
	F(291750000, P_MMPLL1, 4, 0, 0),

	F(400000000, P_MMPLL0, 2, 0, 0),

	F(466800000, P_MMPLL1, 2.5, 0, 0),

	{ }

};



static struct clk_rcg2 mmss_axi_clk_src = {
@@ -307,6 +308,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = { 
	F(150000000, P_GPLL0, 4, 0, 0),

	F(291750000, P_MMPLL1, 4, 0, 0),

	F(400000000, P_MMPLL0, 2, 0, 0),

	{ }

};



static struct clk_rcg2 ocmemnoc_clk_src = {