lkml.org 
[lkml]   [2019]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 082/137] clk: Make clk_bulk_get_all() return a valid "id"
    Date
    From: Bjorn Andersson <bjorn.andersson@linaro.org>

    [ Upstream commit 7f81c2426587b34bf73e643c1a6d080dfa14cf8a ]

    The adreno driver expects the "id" field of the returned clk_bulk_data
    to be filled in with strings from the clock-names property.

    But due to the use of kmalloc_array() in of_clk_bulk_get_all() it
    receives a list of bogus pointers instead.

    Zero-initialize the "id" field and attempt to populate with strings from
    the clock-names property to resolve both these issues.

    Fixes: 616e45df7c4a ("clk: add new APIs to operate on all available clocks")
    Fixes: 8e3e791d20d2 ("drm/msm: Use generic bulk clock function")
    Cc: Dong Aisheng <aisheng.dong@nxp.com>
    Cc: Jordan Crouse <jcrouse@codeaurora.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lkml.kernel.org/r/20190913024029.2640-1-bjorn.andersson@linaro.org
    Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/clk-bulk.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
    index 06499568cf076..db5096fa9a170 100644
    --- a/drivers/clk/clk-bulk.c
    +++ b/drivers/clk/clk-bulk.c
    @@ -18,10 +18,13 @@ static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks,
    int ret;
    int i;

    - for (i = 0; i < num_clks; i++)
    + for (i = 0; i < num_clks; i++) {
    + clks[i].id = NULL;
    clks[i].clk = NULL;
    + }

    for (i = 0; i < num_clks; i++) {
    + of_property_read_string_index(np, "clock-names", i, &clks[i].id);
    clks[i].clk = of_clk_get(np, i);
    if (IS_ERR(clks[i].clk)) {
    ret = PTR_ERR(clks[i].clk);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-06 19:36    [W:4.033 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site