RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-19 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

kmod/core: use FTRACE_OPS_FL_IPMODIFY flag

Browse Source 
ftrace only allows a single user of this flag to register for a given
function.  This prevents kpatch conflicts with kprobes handlers which
also might want to change regs->ip for a function.

We should have done this a few years ago.  Better late than never...
This commit is contained in:
Josh Poimboeuf 2016-08-19 12:09:30 -05:00
parent c305c0b34f
commit 3c7300c341
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kmod/core/core.c
View File

@ -515,9 +515,13 @@ done:
preempt_enable_notrace(); preempt_enable_notrace();
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
#define FTRACE_OPS_FL_IPMODIFY 0
#endif
static struct ftrace_ops kpatch_ftrace_ops __read_mostly = { static struct ftrace_ops kpatch_ftrace_ops __read_mostly = {
.func = kpatch_ftrace_handler, .func = kpatch_ftrace_handler,
.flags = FTRACE_OPS_FL_SAVE_REGS, .flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_IPMODIFY,
}; };
static int kpatch_ftrace_add_func(unsigned long ip) static int kpatch_ftrace_add_func(unsigned long ip)