x86: Fix output of signal_fault(), do_trap() and do_general_protection()

PATCH New Markus Trippelsdorf 1 participant 1 message Apr 7, 2017 x86

Share & tools

Markus Trippelsdorf

author

2017-04-07 12:09 UTC #0 lore raw

PATCH 1/1 x86: Fix output of signal_fault(), do_trap() and do_general_protection()

Since commit 4bcc595ccd80 "printk: reinstate KERN_CONT for printing" the output of signal_fault(), do_trap() and do_general_protection() looks garbled, e.g.:

traps: conftest[9335] trap invalid opcode ip:400428 sp:7ffeaba1b0d8 error:0
in conftest[400000+1000]

Fix the issue by simply adding KERN_CONTs.

Signed-off-by Markus Trippelsdorf <[email protected]>

arch/x86/kernel/signal.c +1 -1

index 396c042e9d0e..cc30a74e4adb 100644
@@ -846,7 +846,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
 		       task_pid_nr(current) > 1 ? KERN_INFO : KERN_EMERG,
 		       me->comm, me->pid, where, frame,
 		       regs->ip, regs->sp, regs->orig_ax);
-		print_vma_addr(" in ", regs->ip);
+		print_vma_addr(KERN_CONT " in ", regs->ip);
 		pr_cont("\n");
 	}

arch/x86/kernel/traps.c +2 -2

index 948443e115c1..4e496379a871 100644
@@ -255,7 +255,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
 		pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
 			tsk->comm, tsk->pid, str,
 			regs->ip, regs->sp, error_code);
-		print_vma_addr(" in ", regs->ip);
+		print_vma_addr(KERN_CONT " in ", regs->ip);
 		pr_cont("\n");
 	}

@@ -519,7 +519,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
 		pr_info("%s[%d] general protection ip:%lx sp:%lx error:%lx",
 			tsk->comm, task_pid_nr(tsk),
 			regs->ip, regs->sp, error_code);
-		print_vma_addr(" in ", regs->ip);
+		print_vma_addr(KERN_CONT " in ", regs->ip);
 		pr_cont("\n");
 	}

Signature · 1 line

Markus