diff options
| author | Anton Blanchard <anton@samba.org> | 2015-04-14 07:51:03 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:04 +0100 |
| commit | 3c9d9d2cc60b5063cda0e92d4b6cdb92da268e7b (patch) | |
| tree | 8b7786080c3fea7f17406c73f3f5feb317493fdf /arch | |
| parent | aae89a4f7996bb0f5ded693fb1768f2faa9f4ace (diff) | |
| download | kernel_samsung_smdk4412-3c9d9d2cc60b5063cda0e92d4b6cdb92da268e7b.zip kernel_samsung_smdk4412-3c9d9d2cc60b5063cda0e92d4b6cdb92da268e7b.tar.gz kernel_samsung_smdk4412-3c9d9d2cc60b5063cda0e92d4b6cdb92da268e7b.tar.bz2 | |
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
commit 9a5cbce421a283e6aea3c4007f141735bf9da8c3 upstream.
We cap 32bit userspace backtraces to PERF_MAX_STACK_DEPTH
(currently 127), but we forgot to do the same for 64bit backtraces.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/perf_callchain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_callchain.c b/arch/powerpc/kernel/perf_callchain.c index 564c1d8..e80026c 100644 --- a/arch/powerpc/kernel/perf_callchain.c +++ b/arch/powerpc/kernel/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; |