From: Cai Li <[email protected]>
In some cases the clock parent would be set NULL when doing re-parent,
it will cause a NULL pointer accessing if clk_set trace event is enabled,
since the trace event function would not check the input parameter.
Signed-off-by: Cai Li <[email protected]>
Signed-off-by: Chunyan Zhang <[email protected]>
---
drivers/clk/clk.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c8d83ac..64efaf0 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1242,13 +1242,12 @@ static int __clk_set_parent(struct clk_core *core, struct clk_core *parent,
old_parent = __clk_set_parent_before(core, parent);
- trace_clk_set_parent(core, parent);
-
/* change clock input source */
- if (parent && core->ops->set_parent)
+ if (parent && core->ops->set_parent) {
+ trace_clk_set_parent(core, parent);
ret = core->ops->set_parent(core->hw, p_index);
-
- trace_clk_set_parent_complete(core, parent);
+ trace_clk_set_parent_complete(core, parent);
+ }
if (ret) {
flags = clk_enable_lock();
--
2.7.4
From 1585933812534556052@xxx Tue Dec 05 08:59:04 +0000 2017
X-GM-THRID: 1585829883368977566
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread