From 776799d35b669aba976a1494ba506db50ebe686c Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Mon, 16 Mar 2009 18:57:22 -0400 Subject: [PATCH] --- yaml --- r: 132430 b: refs/heads/master c: 30390880debce4a68fd23e87a787f27609e4bf4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kprobes.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3c747d1a21cc..ad3980075781 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18439c39e826191c0ef08c3a3271ce7ece46a860 +refs/heads/master: 30390880debce4a68fd23e87a787f27609e4bf4a diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c index e948b28a5a9a..4558dd3918cf 100644 --- a/trunk/arch/x86/kernel/kprobes.c +++ b/trunk/arch/x86/kernel/kprobes.c @@ -193,6 +193,9 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes) kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; + if (search_exception_tables(opcodes)) + return 0; /* Page fault may occur on this address. */ + retry: if (opcodes - orig_opcodes > MAX_INSN_SIZE - 1) return 0;