From a4151fcfbba1d84e248277ba92d6f573584a37e7 Mon Sep 17 00:00:00 2001
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Date: Fri, 5 Sep 2008 16:27:11 -0700
Subject: [PATCH] --- yaml --- r: 113276 b: refs/heads/master c:
 72fa50f4ef9014f4212945b766af84ea94308903 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/x86/kernel/signal_32.c | 18 +++++++++++++++++-
 trunk/include/asm-x86/ptrace.h    |  4 ++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 314160ed577f..cd63f5269cd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb57925f5057837c248b57a51181fd6b138a32f3
+refs/heads/master: 72fa50f4ef9014f4212945b766af84ea94308903
diff --git a/trunk/arch/x86/kernel/signal_32.c b/trunk/arch/x86/kernel/signal_32.c
index 3e4a688bb84f..76d05d703845 100644
--- a/trunk/arch/x86/kernel/signal_32.c
+++ b/trunk/arch/x86/kernel/signal_32.c
@@ -243,7 +243,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long __unused)
 	return ax;
 
 badframe:
-	force_sig(SIGSEGV, current);
+	signal_fault(regs, frame, "rt sigreturn");
 	return 0;
 }
 
@@ -669,3 +669,19 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
 
 	clear_thread_flag(TIF_IRET);
 }
+
+void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
+{
+	struct task_struct *me = current;
+
+	if (show_unhandled_signals && printk_ratelimit()) {
+		printk(KERN_INFO
+		       "%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",
+		       me->comm, me->pid, where, frame,
+		       regs->ip, regs->sp, regs->orig_ax);
+		print_vma_addr(" in ", regs->ip);
+		printk(KERN_CONT "\n");
+	}
+
+	force_sig(SIGSEGV, me);
+}
diff --git a/trunk/include/asm-x86/ptrace.h b/trunk/include/asm-x86/ptrace.h
index a33f027dbbea..fad807769910 100644
--- a/trunk/include/asm-x86/ptrace.h
+++ b/trunk/include/asm-x86/ptrace.h
@@ -144,10 +144,10 @@ convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);
 #ifdef CONFIG_X86_32
 extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
 			 int error_code);
-#else
-void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 #endif
 
+void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
+
 extern long syscall_trace_enter(struct pt_regs *);
 extern void syscall_trace_leave(struct pt_regs *);