diff options
author | Cai Li <cai.li@spreadtrum.com> | 2017-11-21 17:24:38 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-25 11:03:41 +0100 |
commit | dc97e9ecd86d7e02cd5449d7aa43810346693eef (patch) | |
tree | e6f37a54c3aa5023997e6091ff8ab9711c18fb78 /include/trace | |
parent | 343bf423341ca284008c328f3029fa1bdaa531fe (diff) | |
download | linux-stable-dc97e9ecd86d7e02cd5449d7aa43810346693eef.tar.gz linux-stable-dc97e9ecd86d7e02cd5449d7aa43810346693eef.tar.bz2 linux-stable-dc97e9ecd86d7e02cd5449d7aa43810346693eef.zip |
clk: fix a panic error caused by accessing NULL pointer
[ Upstream commit 975b820b6836b6b6c42fb84cd2e772e2b41bca67 ]
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.
This patch sets the parent as "none" if the input parameter is NULL.
Fixes: dfc202ead312 (clk: Add tracepoints for hardware operations)
Signed-off-by: Cai Li <cai.li@spreadtrum.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/clk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/clk.h b/include/trace/events/clk.h index 758607226bfd..2cd449328aee 100644 --- a/include/trace/events/clk.h +++ b/include/trace/events/clk.h @@ -134,12 +134,12 @@ DECLARE_EVENT_CLASS(clk_parent, TP_STRUCT__entry( __string( name, core->name ) - __string( pname, parent->name ) + __string( pname, parent ? parent->name : "none" ) ), TP_fast_assign( __assign_str(name, core->name); - __assign_str(pname, parent->name); + __assign_str(pname, parent ? parent->name : "none"); ), TP_printk("%s %s", __get_str(name), __get_str(pname)) |