diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2014-12-02 08:54:19 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2014-12-03 15:15:34 -0800 |
commit | 10cdfe54dab034311c8e2fad9ba2dffbe616caa9 (patch) | |
tree | 9a475d10896be0745db097ff414dec7447466f9c /drivers/clk/clk.c | |
parent | 4afbe1760d89fec07e7a8cce58beb1b4921a194c (diff) | |
download | linux-10cdfe54dab034311c8e2fad9ba2dffbe616caa9.tar.bz2 |
clk: Don't try to use a struct clk* after it could have been freed
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>
Diffstat (limited to 'drivers/clk/clk.c')
-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 42f940ff5edf..609e9db1a69a 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2268,14 +2268,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 ***/ |