Commit adb584b3 authored by Gabor Juhos's avatar Gabor Juhos Committed by Zheng Zucheng
Browse files

clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays 

stable inclusion
from stable-v5.10.215
commit ae60e3342296f766f88911d39199f77b05f657a6
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5OA
CVE: CVE-2024-26970

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



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

[ Upstream commit cdbc6e2d8108bc47895e5a901cfcaf799b00ca8d ]

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: d9db07f0 ("clk: qcom: Add ipq6018 Global Clock Controller 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-2-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 avatarZheng Zucheng <zhengzucheng@huawei.com>
parent 04dd32cb

drivers/clk/qcom/gcc-ipq6018.c

+2 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,7 @@ static struct clk_regmap_div nss_ubi0_div_clk_src = { 


static const struct freq_tbl ftbl_pcie_aux_clk_src[] = {

	F(24000000, P_XO, 1, 0, 0),

	{ }

};



static const struct clk_parent_data gcc_xo_gpll0_core_pi_sleep_clk[] = {
@@ -1737,6 +1738,7 @@ static const struct freq_tbl ftbl_sdcc_ice_core_clk_src[] = { 
	F(160000000, P_GPLL0, 5, 0, 0),

	F(216000000, P_GPLL6, 5, 0, 0),

	F(308570000, P_GPLL6, 3.5, 0, 0),

	{ }

};



static const struct clk_parent_data gcc_xo_gpll0_gpll6_gpll0_div2[] = {