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

Path	csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Markus Trippelsdorf <markus@trippelsdorf.de>
Newsgroups	linux.kernel
Subject	[PATCH] x86: Fix output of signal_fault(), do_trap() and do_general_protection()
Date	Fri, 07 Apr 2017 14:10:01 +0200
Message-ID	<ttASd-6SI-13@gated-at.bofh.it> (permalink)
X-Original-To	linux-kernel@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=simple; d=trippelsdorf.de; h=date :from:to:cc:subject:message-id:mime-version:content-type; s=k1; bh=uhsnk2jxulgvzVa2sPhBbMhqpz8HVspoxHAoIBzn1ZQ=; b=RpSmudbZoGyC sg6SmzH7yZFlwwlXaXjHeRjoCrVth8R1ZWWwqFQ2MFXeajW55IXfEbPHXf8m8cmG YaqCNzhbxShC+7wPKZpAzeIo+RfbR7IXHEqglYYELYxaNLVAeWdlb+70x7MAEaC8 id5b09PCjYxV+0+QxsEZvtLp5GIIpOk=
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	48
Organization	linux.* mail to news gateway
X-Original-Cc	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Linus Torvalds <torvalds@linux-foundation.org>
X-Original-Date	Fri, 7 Apr 2017 14:09:04 +0200
X-Original-Message-ID	<20170407120904.GA7582@x4>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1618715

Show key headers only | View raw

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 <markus@trippelsdorf.de>

diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 396c042e9d0e..cc30a74e4adb 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -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");
 	}
 
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 948443e115c1..4e496379a871 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -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");
 	}
 
-- 
Markus

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] x86: Fix output of signal_fault(), do_trap() and  do_general_protection() Markus Trippelsdorf <markus@trippelsdorf.de> - 2017-04-07 14:10 +0200

csiph-web