Commit 5e58a417 authored by Gabor Juhos's avatar Gabor Juhos Committed by Liu Chuang
Browse files

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

stable inclusion
from stable-v4.19.312
commit e117c6e2d1617520f5f7d7f6f6b395f01d8b5a27
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9NOH8
CVE: CVE-2024-26969

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



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

[ Upstream commit 1040ef5ed95d6fd2628bad387d78a61633e09429 ]

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: 9607f622 ("clk: qcom: ipq8074: add PCIE, USB and SDCC clocks")
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-3-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 avatarLiu Chuang <liuchuang40@huawei.com>
parent 9ff44822

drivers/clk/qcom/gcc-ipq8074.c

+2 −0
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ static struct clk_rcg2 pcie0_axi_clk_src = { 


static const struct freq_tbl ftbl_pcie_aux_clk_src[] = {

	F(19200000, P_XO, 1, 0, 0),

	{ }

};



static struct clk_rcg2 pcie0_aux_clk_src = {
@@ -1090,6 +1091,7 @@ static const struct freq_tbl ftbl_sdcc_ice_core_clk_src[] = { 
	F(19200000, P_XO, 1, 0, 0),

	F(160000000, P_GPLL0, 5, 0, 0),

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

	{ }

};



static struct clk_rcg2 sdcc1_ice_core_clk_src = {