[PATCH] unwinder: more sanity checks in Dwarf2 unwinder

Tighten the requirements on both input to and output from the Dwarf2
unwinder.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 4 insertions, 8 deletions

diff --git a/include/asm-i386/unwind.h b/include/asm-i386/unwind.h
index 601fc67bd775..aa2c931e30db 100644
--- a/include/asm-i386/unwind.h
+++ b/include/asm-i386/unwind.h
@@ -79,17 +79,13 @@ extern asmlinkage int arch_unwind_init_running(struct unwind_frame_info *,
                                                                           void *arg),
                                                void *arg);
 
-static inline int arch_unw_user_mode(const struct unwind_frame_info *info)
+static inline int arch_unw_user_mode(/*const*/ struct unwind_frame_info *info)
 {
-#if 0 /* This can only work when selector register and EFLAGS saves/restores
-         are properly annotated (and tracked in UNW_REGISTER_INFO). */
-        return user_mode_vm(&info->regs);
-#else
-        return info->regs.eip < PAGE_OFFSET
+        return user_mode_vm(&info->regs)
+               || info->regs.eip < PAGE_OFFSET
                || (info->regs.eip >= __fix_to_virt(FIX_VDSO)
-                    && info->regs.eip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE)
+                   && info->regs.eip < __fix_to_virt(FIX_VDSO) + PAGE_SIZE)
                || info->regs.esp < PAGE_OFFSET;
-#endif
 }
 
 #else