x86/stacktrace: Prevent infinite loop in arch_stack_walk_user()

[linux-2.6-block.git] / arch / x86 / kernel / stacktrace.c

diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 2abf27d7df6b8b8b46b972a52619993075f0812b..4f36d3241faf46e08ecd479e815519d0dc2e074b 100644 (file)
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -129,11 +129,9 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
                        break;
                if ((unsigned long)fp < regs->sp)
                        break;
-               if (frame.ret_addr) {
-                       if (!consume_entry(cookie, frame.ret_addr, false))
-                               return;
-               }
-               if (fp == frame.next_fp)
+               if (!frame.ret_addr)
+                       break;
+               if (!consume_entry(cookie, frame.ret_addr, false))
                        break;
                fp = frame.next_fp;
        }