diff options
| author | Mikko Perttunen <mperttunen@nvidia.com> | 2018-07-11 11:21:04 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-07-25 09:29:12 -0700 |
| commit | 365f7a89c881e84f1ebc925f65f899d5d7ce547e (patch) | |
| tree | edfa2054bf9004cca73a8d39df895fdb32247ea4 /drivers/clk/clk.c | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| download | talos-obmc-linux-365f7a89c881e84f1ebc925f65f899d5d7ce547e.tar.gz talos-obmc-linux-365f7a89c881e84f1ebc925f65f899d5d7ce547e.zip | |
clk: core: Potentially free connection id
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>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 9760b526ca31..eeec6885c302 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -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(); @@ -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; @@ -3346,6 +3348,7 @@ void __clk_put(struct clk *clk) module_put(owner); + kfree_const(clk->con_id); kfree(clk); } |
