summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKishor PK <kpbhat@codeaurora.org>2016-01-29 11:13:25 +0530
committerKyle Yan <kyan@codeaurora.org>2016-05-25 14:21:54 -0700
commit05bd41f94eab0fbeb53864cb17541b55885fe496 (patch)
tree97cc577615c36147b5d4444077e76f9d61c074d8
parent231003b1376550b38d47d0531d8782df38f75ad0 (diff)
trace: prevent NULL pointer dereference
Prevent unintended NULL pointer dereference in trace_event_perf. Change-Id: I35151c460b4350ebd414b67c655684c2019f799f Signed-off-by: Kishor PK <kpbhat@codeaurora.org> Signed-off-by: Srinivasarao P <spathi@codeaurora.org> Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
-rw-r--r--kernel/trace/trace_event_perf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index cc9f7a9319be..731f6484b811 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -256,7 +256,8 @@ int perf_trace_add(struct perf_event *p_event, int flags)
void perf_trace_del(struct perf_event *p_event, int flags)
{
struct trace_event_call *tp_event = p_event->tp_event;
- hlist_del_rcu(&p_event->hlist_entry);
+ if (!hlist_unhashed(&p_event->hlist_entry))
+ hlist_del_rcu(&p_event->hlist_entry);
tp_event->class->reg(tp_event, TRACE_REG_PERF_DEL, p_event);
}