Skip to content

Commit

Permalink
clk: core: Potentially free connection id
Browse files Browse the repository at this point in the history
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: 253160a ("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>
  • Loading branch information
Mikko Perttunen authored and Stephen Boyd committed Jul 25, 2018
1 parent ce397d2 commit 365f7a8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/clk/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2934,6 +2934,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id,
return clk;
}

/* keep in sync with __clk_put */
void __clk_free_clk(struct clk *clk)
{
clk_prepare_lock();
Expand Down Expand Up @@ -3313,6 +3314,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;
Expand Down Expand Up @@ -3346,6 +3348,7 @@ void __clk_put(struct clk *clk)

module_put(owner);

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

Expand Down

0 comments on commit 365f7a8

Please sign in to comment.