mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
tracing/kprobes: Fix within_notrace_func() to check only notrace functions
Fix within_notrace_func() to check only notrace functions and to ignore the
kprobe-event which can not solve symbol addresses.
within_notrace_func() returns true if the given kprobe events probe point
seems to be out-of-range. But that is not the correct place to check for it,
it should be done in kprobes afterwards.
kprobe-events allow users to define a probe point on "currently unloaded
module" so that it can trace the event during module load. In this case, the
user will put a probe on a symbol which is not in kallsyms yet and it hits
the within_notrace_func(). As a result, kprobe-events always refuses if
user defines a probe on a "currenly unloaded module".
Fixes: commit 45408c4f92
("tracing: kprobes: Prohibit probing on notrace function")
Link: http://lkml.kernel.org/r/153319624799.29007.13604430345640129926.stgit@devbox
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
parent
44ec3ec01f
commit
6bc6c77cfc
1 changed files with 5 additions and 3 deletions
|
@ -88,6 +88,7 @@ static nokprobe_inline unsigned long trace_kprobe_nhit(struct trace_kprobe *tk)
|
||||||
return nhit;
|
return nhit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return 0 if it fails to find the symbol address */
|
||||||
static nokprobe_inline
|
static nokprobe_inline
|
||||||
unsigned long trace_kprobe_address(struct trace_kprobe *tk)
|
unsigned long trace_kprobe_address(struct trace_kprobe *tk)
|
||||||
{
|
{
|
||||||
|
@ -96,7 +97,8 @@ unsigned long trace_kprobe_address(struct trace_kprobe *tk)
|
||||||
if (tk->symbol) {
|
if (tk->symbol) {
|
||||||
addr = (unsigned long)
|
addr = (unsigned long)
|
||||||
kallsyms_lookup_name(trace_kprobe_symbol(tk));
|
kallsyms_lookup_name(trace_kprobe_symbol(tk));
|
||||||
addr += tk->rp.kp.offset;
|
if (addr)
|
||||||
|
addr += tk->rp.kp.offset;
|
||||||
} else {
|
} else {
|
||||||
addr = (unsigned long)tk->rp.kp.addr;
|
addr = (unsigned long)tk->rp.kp.addr;
|
||||||
}
|
}
|
||||||
|
@ -519,8 +521,8 @@ static bool within_notrace_func(struct trace_kprobe *tk)
|
||||||
unsigned long offset, size, addr;
|
unsigned long offset, size, addr;
|
||||||
|
|
||||||
addr = trace_kprobe_address(tk);
|
addr = trace_kprobe_address(tk);
|
||||||
if (!kallsyms_lookup_size_offset(addr, &size, &offset))
|
if (!addr || !kallsyms_lookup_size_offset(addr, &size, &offset))
|
||||||
return true; /* Out of range. */
|
return false;
|
||||||
|
|
||||||
return !ftrace_location_range(addr - offset, addr - offset + size);
|
return !ftrace_location_range(addr - offset, addr - offset + size);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue