summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard2015-04-13 23:51:03 +0200
committerMichael Ellerman2015-04-14 08:21:16 +0200
commit9a5cbce421a283e6aea3c4007f141735bf9da8c3 (patch)
tree90dffd2ba5a0ca50e266d41100c8909cc70aebe0
parentpowerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails (diff)
downloadkernel-qcow2-linux-9a5cbce421a283e6aea3c4007f141735bf9da8c3.tar.gz
kernel-qcow2-linux-9a5cbce421a283e6aea3c4007f141735bf9da8c3.tar.xz
kernel-qcow2-linux-9a5cbce421a283e6aea3c4007f141735bf9da8c3.zip
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
We cap 32bit userspace backtraces to PERF_MAX_STACK_DEPTH (currently 127), but we forgot to do the same for 64bit backtraces. Cc: stable@vger.kernel.org Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/perf/callchain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c
index 2396dda282cd..ead55351b254 100644
--- a/arch/powerpc/perf/callchain.c
+++ b/arch/powerpc/perf/callchain.c
@@ -243,7 +243,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry,
sp = regs->gpr[1];
perf_callchain_store(entry, next_ip);
- for (;;) {
+ while (entry->nr < PERF_MAX_STACK_DEPTH) {
fp = (unsigned long __user *) sp;
if (!valid_user_sp(sp, 1) || read_user_stack_64(fp, &next_sp))
return;