]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
livepatch: use FTRACE_OPS_FL_IPMODIFY
authorJosh Poimboeuf <jpoimboe@redhat.com>
Mon, 22 Dec 2014 12:39:54 +0000 (13:39 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Dec 2014 19:05:59 +0000 (20:05 +0100)
Use the FTRACE_OPS_FL_IPMODIFY flag to prevent conflicts with other
ftrace users who also modify regs->ip.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
kernel/livepatch/core.c

index 07a2db9d01e6d51aec90a8789b5b3a8b9dc90226..6f6387912da748ccd6cc0fcf228b45f641d69827 100644 (file)
@@ -641,7 +641,8 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func)
 
        ops->private = func;
        ops->func = klp_ftrace_handler;
-       ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC;
+       ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC |
+                    FTRACE_OPS_FL_IPMODIFY;
        func->fops = ops;
        func->state = KLP_DISABLED;