diff options
| -rw-r--r-- | kernel/events/core.c | 6 | ||||
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index b7045ba1f..94936639e 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5457,7 +5457,8 @@ static int perf_swevent_add(struct perf_event *event, int flags) static void perf_swevent_del(struct perf_event *event, int flags) { - hlist_del_rcu(&event->hlist_entry); + if(!hlist_unhashed(&event->hlist_entry)) + hlist_del_rcu(&event->hlist_entry); } static void perf_swevent_start(struct perf_event *event, int flags) @@ -6737,6 +6738,9 @@ SYSCALL_DEFINE5(perf_event_open, if (err) return err; + if (attr.__reserved_1) + return -EINVAL; + if (!attr.exclude_kernel) { if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) return -EACCES; diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 8354dc81a..4025c6034 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -222,7 +222,10 @@ int perf_trace_add(struct perf_event *p_event, int flags) void perf_trace_del(struct perf_event *p_event, int flags) { struct ftrace_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); + else + return; tp_event->class->reg(tp_event, TRACE_REG_PERF_DEL, p_event); } |