]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.19.312/clk-qcom-mmcc-apq8084-fix-terminating-of-frequency-t.patch
Linux 4.19.312
[thirdparty/kernel/stable-queue.git] / releases / 4.19.312 / clk-qcom-mmcc-apq8084-fix-terminating-of-frequency-t.patch
1 From 3a1b427ff627f15e2d837ead93fd11715fd40b8a Mon Sep 17 00:00:00 2001
2 From: Sasha Levin <sashal@kernel.org>
3 Date: Thu, 29 Feb 2024 19:07:51 +0100
4 Subject: clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
5
6 From: Gabor Juhos <j4g8y7@gmail.com>
7
8 [ Upstream commit a903cfd38d8dee7e754fb89fd1bebed99e28003d ]
9
10 The frequency table arrays are supposed to be terminated with an
11 empty element. Add such entry to the end of the arrays where it
12 is missing in order to avoid possible out-of-bound access when
13 the table is traversed by functions like qcom_find_freq() or
14 qcom_find_freq_floor().
15
16 Only compile tested.
17
18 Fixes: 2b46cd23a5a2 ("clk: qcom: Add APQ8084 Multimedia Clock Controller (MMCC) support")
19 Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
20 Reviewed-by: Stephen Boyd <sboyd@kernel.org>
21 Cc: stable@vger.kernel.org
22 Link: https://lore.kernel.org/r/20240229-freq-table-terminator-v1-6-074334f0905c@gmail.com
23 Signed-off-by: Bjorn Andersson <andersson@kernel.org>
24 Signed-off-by: Sasha Levin <sashal@kernel.org>
25 ---
26 drivers/clk/qcom/mmcc-apq8084.c | 2 ++
27 1 file changed, 2 insertions(+)
28
29 diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c
30 index 4ce1d7c88377f..36a40b0ddfa1f 100644
31 --- a/drivers/clk/qcom/mmcc-apq8084.c
32 +++ b/drivers/clk/qcom/mmcc-apq8084.c
33 @@ -341,6 +341,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = {
34 F(333430000, P_MMPLL1, 3.5, 0, 0),
35 F(400000000, P_MMPLL0, 2, 0, 0),
36 F(466800000, P_MMPLL1, 2.5, 0, 0),
37 + { }
38 };
39
40 static struct clk_rcg2 mmss_axi_clk_src = {
41 @@ -365,6 +366,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = {
42 F(150000000, P_GPLL0, 4, 0, 0),
43 F(228570000, P_MMPLL0, 3.5, 0, 0),
44 F(320000000, P_MMPLL0, 2.5, 0, 0),
45 + { }
46 };
47
48 static struct clk_rcg2 ocmemnoc_clk_src = {
49 --
50 2.43.0
51