diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 11:10:44 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 11:10:44 -0500 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /arch/arm/kernel/stacktrace.c | |
| parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
| parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
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 00f79e59985b..af4e8c8a5422 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c | |||
| @@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) | |||
| 31 | high = ALIGN(low, THREAD_SIZE); | 31 | high = ALIGN(low, THREAD_SIZE); |
| 32 | 32 | ||
| 33 | /* check current frame pointer is within bounds */ | 33 | /* check current frame pointer is within bounds */ |
| 34 | if (fp < (low + 12) || fp + 4 >= high) | 34 | if (fp < low + 12 || fp > high - 4) |
| 35 | return -EINVAL; | 35 | return -EINVAL; |
| 36 | 36 | ||
| 37 | /* restore the registers from the stack frame */ | 37 | /* restore the registers from the stack frame */ |