diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 19:20:05 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-10-09 19:20:05 (GMT) |
| commit | db8c246937713e60b7628661ccc187eeb81f2bae (patch) | |
| tree | 6351e8bca23eef40fce85396d1c6f6cfffbd4b66 /kernel/events/callchain.c | |
| parent | c5f66e99b7cb091e3d51ae8e8156892e8feb7fa3 (diff) | |
| parent | 28f2b02bc581ffc835bc1691b18d03f62fcf0395 (diff) | |
| download | linux-fsl-qoriq-db8c246937713e60b7628661ccc187eeb81f2bae.tar.xz | |
Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'kernel/events/callchain.c')
| -rw-r--r-- | kernel/events/callchain.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 6581a04..98d4597 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -153,7 +153,8 @@ put_callchain_entry(int rctx) put_recursion_context(__get_cpu_var(callchain_recursion), rctx); } -struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) +struct perf_callchain_entry * +perf_callchain(struct perf_event *event, struct pt_regs *regs) { int rctx; struct perf_callchain_entry *entry; @@ -178,6 +179,12 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) } if (regs) { + /* + * Disallow cross-task user callchains. + */ + if (event->ctx->task && event->ctx->task != current) + goto exit_put; + perf_callchain_store(entry, PERF_CONTEXT_USER); perf_callchain_user(entry, regs); } |