From 51ca465a50cd3773cc7e894132797ffda128c3f7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 7 Aug 2008 23:04:37 -0700 Subject: [PATCH] --- yaml --- r: 107943 b: refs/heads/master c: 433c5f706856689be25928a99636e724fb3ea7cf h: refs/heads/master i: 107941: d94dd63a5ebb272fe0cc734b1da416db556b610b 107939: 0af736ea3bc4b8f2c8cb79a89b6e960ed60e8b1e 107935: 3be00e78a605c8271a11b5ecc6246b69621299a9 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/stacktrace.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4eb02393a8e8..931aec01dcec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 764f2579d95120e1c76b7af1256d02466ddd00bf +refs/heads/master: 433c5f706856689be25928a99636e724fb3ea7cf diff --git a/trunk/arch/sparc64/kernel/stacktrace.c b/trunk/arch/sparc64/kernel/stacktrace.c index b3e3737750d8..e9d7f0660f2e 100644 --- a/trunk/arch/sparc64/kernel/stacktrace.c +++ b/trunk/arch/sparc64/kernel/stacktrace.c @@ -26,13 +26,15 @@ void save_stack_trace(struct stack_trace *trace) /* Bogus frame pointer? */ if (fp < (thread_base + sizeof(struct thread_info)) || - fp >= (thread_base + THREAD_SIZE)) + fp > (thread_base + THREAD_SIZE - sizeof(struct sparc_stackf))) break; sf = (struct sparc_stackf *) fp; regs = (struct pt_regs *) (sf + 1); - if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { + if (((unsigned long)regs <= + (thread_base + THREAD_SIZE - sizeof(*regs))) && + (regs->magic & ~0x1ff) == PT_REGS_MAGIC) { if (!(regs->tstate & TSTATE_PRIV)) break; pc = regs->tpc;