lkml.org 
[lkml]   [2019]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 018/171] clk: ti: Fix error handling in ti_clk_parse_divider_data()
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 303aef8b84272d73999a3207dd05bbe10ed89dc5 ]

    The ti_clk_parse_divider_data() function is only called from
    _get_div_table_from_setup(). That function doesn't look at the return
    value but instead looks at the "*table" pointer. In this case, if the
    kcalloc() fails then *table is NULL (which means success). It should
    instead be an error pointer.

    The ti_clk_parse_divider_data() function has two callers. One checks
    for errors and the other doesn't. I have fixed it so now both handle
    errors.

    Fixes: 4f6be5655dc9 ("clk: ti: divider: add driver internal API for parsing divider data")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Tero Kristo <t-kristo@ti.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/ti/divider.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
    index 8d77090ad94a..0241450f3eb3 100644
    --- a/drivers/clk/ti/divider.c
    +++ b/drivers/clk/ti/divider.c
    @@ -403,8 +403,10 @@ int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
    num_dividers = i;

    tmp = kcalloc(valid_div + 1, sizeof(*tmp), GFP_KERNEL);
    - if (!tmp)
    + if (!tmp) {
    + *table = ERR_PTR(-ENOMEM);
    return -ENOMEM;
    + }

    valid_div = 0;
    *width = 0;
    @@ -439,6 +441,7 @@ struct clk_hw *ti_clk_build_component_div(struct ti_clk_divider *setup)
    {
    struct clk_omap_divider *div;
    struct clk_omap_reg *reg;
    + int ret;

    if (!setup)
    return NULL;
    @@ -458,6 +461,12 @@ struct clk_hw *ti_clk_build_component_div(struct ti_clk_divider *setup)
    div->flags |= CLK_DIVIDER_POWER_OF_TWO;

    div->table = _get_div_table_from_setup(setup, &div->width);
    + if (IS_ERR(div->table)) {
    + ret = PTR_ERR(div->table);
    + kfree(div);
    + return ERR_PTR(ret);
    + }
    +

    div->shift = setup->bit_shift;
    div->latch = -EINVAL;
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-12 19:09    [W:4.455 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site