kprobes: Warn if optprobe handler tries to change execution path

Warn if optprobe handler tries to change execution path.
As described in Documentation/kprobes.txt, with optprobe
user handler can not change instruction pointer. In that
case user must avoid optimizing the kprobes by setting
post_handler or break_handler.

Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Ananth N Mavinakayanahalli <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Paul E . McKenney <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/150581521955.32348.3615624715034787365.stgit@devbox
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 15fba7fe57c84dc5712faad0958c1f9b32e476fc..2d28377a0e32d80e57092b70f2db5abbcb0e8c03 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -387,7 +387,10 @@ void opt_pre_handler(struct kprobe *p, struct pt_regs *regs)
        list_for_each_entry_rcu(kp, &p->list, list) {
                if (kp->pre_handler && likely(!kprobe_disabled(kp))) {
                        set_kprobe_instance(kp);
-                       kp->pre_handler(kp, regs);
+                       if (kp->pre_handler(kp, regs)) {
+                               if (WARN_ON_ONCE(1))
+                                       pr_err("Optprobe ignores instruction pointer changing.(%pF)\n", p->addr);
+                       }
                }
                reset_kprobe_instance();
        }