diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2014-12-02 08:54:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-27 08:18:55 -0800 |
| commit | d3bc0f5b485af25d9d314ec072ca0297cf58f6c0 (patch) | |
| tree | 7797e082d4380e45de4ac207ffa8561fa5e0ec6f | |
| parent | f35509c3a16001ba8425c341ce3b0e8d0909c822 (diff) | |
clk: Don't try to use a struct clk* after it could have been freed
commit 10cdfe54dab034311c8e2fad9ba2dffbe616caa9 upstream.
As __clk_release could call kfree on clk and then we wouldn't have a safe way
of getting the module that owns the clock.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: fcb0ee6a3d33 ("clk: Implement clk_unregister")
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/clk/clk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f9c4632d4dd3..7145f6d93567 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2232,14 +2232,17 @@ int __clk_get(struct clk *clk) void __clk_put(struct clk *clk) { + struct module *owner; + if (!clk || WARN_ON_ONCE(IS_ERR(clk))) return; clk_prepare_lock(); + owner = clk->owner; kref_put(&clk->ref, __clk_release); clk_prepare_unlock(); - module_put(clk->owner); + module_put(owner); } /*** clk rate change notifiers ***/ |