From b82bbb6cb402e95f711a7ec3d5f653f59e8ea9e0 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Sep 2008 12:22:47 +0900
Subject: [PATCH] --- yaml --- r: 116104 b: refs/heads/master c:
 037c10a612e8b7461e33672fb3848807ac6e2346 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sh/include/asm/kprobes.h |  3 +--
 trunk/arch/sh/kernel/kprobes.c      |  2 +-
 trunk/arch/sh/mm/fault_32.c         | 29 ++++++++++++++++++++++++++++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 39fb6cde6831..6b1f0d556d9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc63562ac2107dfa843f5288fe985fc6f0021c17
+refs/heads/master: 037c10a612e8b7461e33672fb3848807ac6e2346
diff --git a/trunk/arch/sh/include/asm/kprobes.h b/trunk/arch/sh/include/asm/kprobes.h
index 70fc629df904..756a5cd96378 100644
--- a/trunk/arch/sh/include/asm/kprobes.h
+++ b/trunk/arch/sh/include/asm/kprobes.h
@@ -6,8 +6,6 @@
 #include <linux/types.h>
 #include <linux/ptrace.h>
 
-struct pt_regs;
-
 typedef u16 kprobe_opcode_t;
 #define BREAKPOINT_INSTRUCTION	0xc3ff
 
@@ -48,6 +46,7 @@ struct kprobe_ctlblk {
 	struct prev_kprobe prev_kprobe;
 };
 
+extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 extern int kprobe_exceptions_notify(struct notifier_block *self,
 				    unsigned long val, void *data);
 extern int kprobe_handle_illslot(unsigned long pc);
diff --git a/trunk/arch/sh/kernel/kprobes.c b/trunk/arch/sh/kernel/kprobes.c
index ac6074942fd6..81a3725e5155 100644
--- a/trunk/arch/sh/kernel/kprobes.c
+++ b/trunk/arch/sh/kernel/kprobes.c
@@ -393,7 +393,7 @@ static inline int post_kprobe_handler(struct pt_regs *regs)
 	return 1;
 }
 
-static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 {
 	struct kprobe *cur = kprobe_running();
 	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c
index e8efda9846bb..659811c179e6 100644
--- a/trunk/arch/sh/mm/fault_32.c
+++ b/trunk/arch/sh/mm/fault_32.c
@@ -2,7 +2,7 @@
  * Page fault handler for SH with an MMU.
  *
  *  Copyright (C) 1999  Niibe Yutaka
- *  Copyright (C) 2003 - 2007  Paul Mundt
+ *  Copyright (C) 2003 - 2008  Paul Mundt
  *
  *  Based on linux/arch/i386/mm/fault.c:
  *   Copyright (C) 1995  Linus Torvalds
@@ -21,6 +21,27 @@
 #include <asm/tlbflush.h>
 #include <asm/kgdb.h>
 
+#ifdef CONFIG_KPROBES
+static inline int notify_page_fault(struct pt_regs *regs, int trap)
+{
+	int ret = 0;
+
+	if (!user_mode(regs)) {
+		preempt_disable();
+		if (kprobe_running() && kprobe_fault_handler(regs, trap))
+			ret = 1;
+		preempt_enable();
+	}
+
+	return ret;
+}
+#else
+static inline int notify_page_fault(struct pt_regs *regs, int trap)
+{
+	return 0;
+}
+#endif
+
 /*
  * This routine handles page faults.  It determines the address,
  * and the problem, and then passes it off to one of the appropriate
@@ -37,6 +58,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	int fault;
 	siginfo_t info;
 
+	if (notify_page_fault(regs, writeaccess))
+		return;
+
 #ifdef CONFIG_SH_KGDB
 	if (kgdb_nofault && kgdb_bus_err_hook)
 		kgdb_bus_err_hook();
@@ -269,6 +293,9 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
 	pte_t *pte;
 	pte_t entry;
 
+	if (notify_page_fault(regs, writeaccess))
+		return 0;
+
 #ifdef CONFIG_SH_KGDB
 	if (kgdb_nofault && kgdb_bus_err_hook)
 		kgdb_bus_err_hook();