summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorbibo,mao <bibo.mao@intel.com>2006-03-26 01:38:21 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 08:57:04 -0800
commit2326c77017c79fd6d55c69d8a49a57a252921bcd (patch)
tree5a2cafc7452953a4d5c8a8e8eaa0ae34fe306f74 /arch/ia64
parentc6fd91f0bdcd294a0ae0ba2b2a7f7456ef4b7144 (diff)
downloadkernel-crypto-2326c77017c79fd6d55c69d8a49a57a252921bcd.tar.gz
kernel-crypto-2326c77017c79fd6d55c69d8a49a57a252921bcd.tar.xz
kernel-crypto-2326c77017c79fd6d55c69d8a49a57a252921bcd.zip
[PATCH] kprobe handler: discard user space trap
Currently kprobe handler traps only happen in kernel space, so function kprobe_exceptions_notify should skip traps which happen in user space. This patch modifies this, and it is based on 2.6.16-rc4. Signed-off-by: bibo mao <bibo.mao@intel.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@intel.com> Cc: <hiramatu@sdl.hitachi.co.jp> Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/kprobes.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 50ae8c7d453..45b8479c986 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -740,6 +740,9 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
struct die_args *args = (struct die_args *)data;
int ret = NOTIFY_DONE;
+ if (args->regs && user_mode(args->regs))
+ return ret;
+
switch(val) {
case DIE_BREAK:
/* err is break number from ia64_bad_break() */