[PATCH] i386: extra checks in show_registers()

Sometimes thread_info and task_struct get out-of-sync with each other.
Printing task.thread_info in show_registers() can help spot this.  And when
task_struct is corrupt then task.comm can contain garbage, so only print as
many characters as it can hold.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index df9d210626ac..dcc14477af1f 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -274,8 +274,9 @@ void show_registers(struct pt_regs *regs)
                 regs->esi, regs->edi, regs->ebp, esp);
         printk(KERN_EMERG "ds: %04x   es: %04x   ss: %04x\n",
                 regs->xds & 0xffff, regs->xes & 0xffff, ss);
-        printk(KERN_EMERG "Process %s (pid: %d, threadinfo=%p task=%p)",
-                current->comm, current->pid, current_thread_info(), current);
+        printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
+                TASK_COMM_LEN, current->comm, current->pid,
+                current_thread_info(), current, current->thread_info);
         /*
          * When in-kernel, we also print out the stack and code at the
          * time of the fault..