Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e04a118 authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Linus Torvalds
Browse files

[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: default avatarChuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 722f4f5b

arch/i386/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -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..