Commit 365f7a89 authored Jul 11, 2018 by Mikko Perttunen Committed by Stephen Boyd Jul 25, 2018

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: 253160a8 ("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>

parent ce397d21

drivers/clk/clk.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message