diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 14:07:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 14:07:12 -0500 |
commit | ae51ce9061b1ddc0fde363913c932bee5b9bc5fd (patch) | |
tree | 40fd3d633714d2a53fdbd2bdd172fb61232d999a /kernel/perf_event.c | |
parent | 072b198a4ad48bd722ec6d203d65422a4698eae7 (diff) | |
parent | 423478cde453eebdfcfebf4b8d378d8f5d49b853 (diff) |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index cb6c0d2af68f..40c3aab648a1 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -4773,15 +4773,6 @@ static int perf_tp_event_init(struct perf_event *event) | |||
4773 | if (event->attr.type != PERF_TYPE_TRACEPOINT) | 4773 | if (event->attr.type != PERF_TYPE_TRACEPOINT) |
4774 | return -ENOENT; | 4774 | return -ENOENT; |
4775 | 4775 | ||
4776 | /* | ||
4777 | * Raw tracepoint data is a severe data leak, only allow root to | ||
4778 | * have these. | ||
4779 | */ | ||
4780 | if ((event->attr.sample_type & PERF_SAMPLE_RAW) && | ||
4781 | perf_paranoid_tracepoint_raw() && | ||
4782 | !capable(CAP_SYS_ADMIN)) | ||
4783 | return -EPERM; | ||
4784 | |||
4785 | err = perf_trace_init(event); | 4776 | err = perf_trace_init(event); |
4786 | if (err) | 4777 | if (err) |
4787 | return err; | 4778 | return err; |