lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 032/235] clk: core: Potentially free connection id
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mikko Perttunen <mperttunen@nvidia.com>

    [ Upstream commit 365f7a89c881e84f1ebc925f65f899d5d7ce547e ]

    Patch "clk: core: Copy connection id" made it so that the connector id
    'con_id' is kstrdup_const()ed to cater to drivers that pass non-constant
    connection ids. The patch added the corresponding kfree_const to
    __clk_free_clk(), but struct clk's can be freed also via __clk_put().
    Add the kfree_const call to __clk_put() and add comments to both
    functions to remind that the logic in them should be kept in sync.

    Fixes: 253160a8ad06 ("clk: core: Copy connection id")
    Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
    Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/clk/clk.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/clk/clk.c
    +++ b/drivers/clk/clk.c
    @@ -2933,6 +2933,7 @@ struct clk *__clk_create_clk(struct clk_
    return clk;
    }

    +/* keep in sync with __clk_put */
    void __clk_free_clk(struct clk *clk)
    {
    clk_prepare_lock();
    @@ -3312,6 +3313,7 @@ int __clk_get(struct clk *clk)
    return 1;
    }

    +/* keep in sync with __clk_free_clk */
    void __clk_put(struct clk *clk)
    {
    struct module *owner;
    @@ -3345,6 +3347,7 @@ void __clk_put(struct clk *clk)

    module_put(owner);

    + kfree_const(clk->con_id);
    kfree(clk);
    }


    \
     
     \ /
      Last update: 2018-09-24 14:52    [W:6.235 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site