Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e8612f authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Jiri Kosina
Browse files

livepatch: use FTRACE_OPS_FL_IPMODIFY 



Use the FTRACE_OPS_FL_IPMODIFY flag to prevent conflicts with other
ftrace users who also modify regs->ip.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.cz>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b5bfc517

kernel/livepatch/core.c

+2 −1
Original line number Diff line number Diff line
@@ -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;