summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <k.khlebnikov@samsung.com>2013-12-05 14:23:48 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-20 07:34:19 -0800
commit47131c7c78b82c3b67020ee99834841ec6f096b5 (patch)
tree170a2b52ecb7e3f93d7615d6c1ca105c23201235 /arch
parentfa2ea62aebfc642b13e0bd02c693c35cc910605c (diff)
downloadlwn-47131c7c78b82c3b67020ee99834841ec6f096b5.tar.gz
lwn-47131c7c78b82c3b67020ee99834841ec6f096b5.zip
ARM: 7913/1: fix framepointer check in unwind_frame
commit 3abb6671a9c04479c4bd026798a05f857393b7e2 upstream. This patch fixes corner case when (fp + 4) overflows unsigned long, for example: fp = 0xFFFFFFFF -> fp + 4 == 3. Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 */