diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
| commit | fbd22402164e687fd1be9a1372ee4f6b9373c860 (patch) | |
| tree | fd86c8b2f8ed120a2229a1de7959f0d4e56c8008 /arch/arm/kernel/stacktrace.c | |
| parent | f78c4cffb86a9f1732674d810ac338cd694b1885 (diff) | |
| parent | c606850407d9096415e226c75a871d0650404446 (diff) | |
Merge back earlier 'pm-sleep' material.
Diffstat (limited to 'arch/arm/kernel/stacktrace.c')
| -rw-r--r-- | arch/arm/kernel/stacktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 00f79e59985..af4e8c8a542 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) high = ALIGN(low, THREAD_SIZE); /* check current frame pointer is within bounds */ - if (fp < (low + 12) || fp + 4 >= high) + if (fp < low + 12 || fp > high - 4) return -EINVAL; /* restore the registers from the stack frame */ |