[PATCH 3.2 128/185] ARM: 7913/1: fix framepointer check in unwind_frame
3.2.54-rc1 review patch. If anyone has any objections, please let me know. -- From: Konstantin Khlebnikov commit 3abb6671a9c04479c4bd026798a05f857393b7e2 upstream. This patch fixes corner case when (fp + 4) overflows unsigned long, for example: fp = 0x -> fp + 4 == 3. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Russell King Signed-off-by: Ben Hutchings --- arch/arm/kernel/stacktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackfra 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.2 128/185] ARM: 7913/1: fix framepointer check in unwind_frame
3.2.54-rc1 review patch. If anyone has any objections, please let me know. -- From: Konstantin Khlebnikov k.khlebni...@samsung.com commit 3abb6671a9c04479c4bd026798a05f857393b7e2 upstream. This patch fixes corner case when (fp + 4) overflows unsigned long, for example: fp = 0x - fp + 4 == 3. Signed-off-by: Konstantin Khlebnikov k.khlebni...@samsung.com Signed-off-by: Russell King rmk+ker...@arm.linux.org.uk Signed-off-by: Ben Hutchings b...@decadent.org.uk --- arch/arm/kernel/stacktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackfra 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 */ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
