Commit 69af14ab authored by Gabor Juhos's avatar Gabor Juhos Committed by Li Zetao
Browse files

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

stable inclusion
from stable-v4.19.312
commit 5533686e99b04994d7c4877dc0e4282adc9444a2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5G5
CVE: CVE-2024-26966

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



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

[ Upstream commit a903cfd38d8dee7e754fb89fd1bebed99e28003d ]

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: 2b46cd23 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
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-6-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 avatarLi Zetao <lizetao1@huawei.com>
parent 9ff44822

drivers/clk/qcom/mmcc-apq8084.c

+2 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = { 
	F(333430000, P_MMPLL1, 3.5, 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 = {
@@ -365,6 +366,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = { 
	F(150000000, P_GPLL0, 4, 0, 0),

	F(228570000, P_MMPLL0, 3.5, 0, 0),

	F(320000000, P_MMPLL0, 2.5, 0, 0),

	{ }

};



static struct clk_rcg2 ocmemnoc_clk_src = {