summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <k.khlebnikov@samsung.com>2013-12-05 14:23:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-12-10 00:24:33 +0100
commit3abb6671a9c04479c4bd026798a05f857393b7e2 (patch)
treec27d0ed62506b334564c7223616b783f4a1a35a8 /arch
parentARM: 7912/1: check stack pointer in get_wchan (diff)
downloadlinux-3abb6671a9c04479c4bd026798a05f857393b7e2.tar.xz
linux-3abb6671a9c04479c4bd026798a05f857393b7e2.zip
ARM: 7913/1: fix framepointer check in unwind_frame
This patch fixes corner case when (fp + 4) overflows unsigned long, for example: fp = 0xFFFFFFFF -> fp + 4 == 3. Cc: <stable@vger.kernel.org> Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/stacktrace.c2
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)
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 */