OSDN Git Service

x86/kprobes: Fix build errors and blacklist context_track_user
authorMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Sat, 14 Jun 2014 06:47:12 +0000 (06:47 +0000)
committerIngo Molnar <mingo@kernel.org>
Sat, 14 Jun 2014 07:07:44 +0000 (09:07 +0200)
commit4cdf77a828b056258f48a9f6078bd2f77d9704bb
tree2a7a904eddc42c595c6a82204a9032b97d0c071f
parented9ea4ed3a44e8f8e8c7e8a12a05fd73f9ae1fb4
x86/kprobes: Fix build errors and blacklist context_track_user

This essentially reverts commit:

  ecd50f714c42 ("kprobes, x86: Call exception_enter after kprobes handled")

since it causes build errors with CONFIG_CONTEXT_TRACKING and
that has been made from misunderstandings;
context_track_user_*() don't involve much in interrupt context,
it just returns if in_interrupt() is true.

Instead of changing the do_debug/int3(), this just adds
context_track_user_*() to kprobes blacklist, since those are
still can be called right before kprobes handles int3 and debug
exceptions, and probing those will cause an infinite loop.

Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Seiji Aguchi <seiji.aguchi@hds.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20140614064711.7865.45957.stgit@kbuild-fedora.novalocal
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/traps.c
kernel/context_tracking.c