diff mbox series

clk: qcom: Allocate space for NULL terimation in DFS table

Message ID 20180830173437.63601-1-dianders@chromium.org (mailing list archive)
State Accepted, archived
Headers show
Series clk: qcom: Allocate space for NULL terimation in DFS table | expand

Commit Message

Doug Anderson Aug. 30, 2018, 5:34 p.m. UTC
The table allocated in clk_rcg2_dfs_populate_freq_table() is
eventually iterated over by qcom_find_freq() which assumes that the
table is NULL terminated.  Allocate one extra space in the array for
the NULL termination.  Initting of the NULL termination is implicit
due to kcalloc().

Fixes: cc4f6944d0e3 ("clk: qcom: Add support for RCG to register for DFS")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---

 drivers/clk/qcom/clk-rcg2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Stephen Boyd Aug. 30, 2018, 9:59 p.m. UTC | #1
Quoting Douglas Anderson (2018-08-30 10:34:37)
> The table allocated in clk_rcg2_dfs_populate_freq_table() is
> eventually iterated over by qcom_find_freq() which assumes that the
> table is NULL terminated.  Allocate one extra space in the array for
> the NULL termination.  Initting of the NULL termination is implicit
> due to kcalloc().
> 
> Fixes: cc4f6944d0e3 ("clk: qcom: Add support for RCG to register for DFS")
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---

Applied to clk-next
diff mbox series

Patch

diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
index d5d77f9ad170..6e3bd195d012 100644
--- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c
@@ -993,7 +993,8 @@  static int clk_rcg2_dfs_populate_freq_table(struct clk_rcg2 *rcg)
 	struct freq_tbl *freq_tbl;
 	int i;
 
-	freq_tbl = kcalloc(MAX_PERF_LEVEL, sizeof(*freq_tbl), GFP_KERNEL);
+	/* Allocate space for 1 extra since table is NULL terminated */
+	freq_tbl = kcalloc(MAX_PERF_LEVEL + 1, sizeof(*freq_tbl), GFP_KERNEL);
 	if (!freq_tbl)
 		return -ENOMEM;
 	rcg->freq_tbl = freq_tbl;