archive mirror
 help / color / mirror / Atom feed
From: Masami Hiramatsu <>
Cc: Francis Deslauriers <>,,,,,
	Michael Rodin <>,
	Ravi Bangoria <>,,
	Arnaldo Carvalho de Melo <>
Subject: [BUGFIX PATCH] tracing/kprobes: Fix to check notrace function with correct range
Date: Tue, 21 Aug 2018 22:04:57 +0900	[thread overview]
Message-ID: <153485669706.16611.17726752296213785504.stgit@devbox> (raw)
In-Reply-To: <>
In-Reply-To: <>

Fix within_notrace_func() to check notrace function correctly.

Since the ftrace_location_range(start, end) function checks
the range inclusively (start <= ftrace-loc <= end), the end
address must not include the entry address of next function.

However, within_notrace_func() uses kallsyms_lookup_size_offset()
to get the function size and calculate the end address from
adding the size to the entry address. This means the end address
is the entry address of the next function.

In the result, within_notrace_func() fails to find notrace
function if the next function of the target function is

Let's subtract 1 from the end address so that ftrace_location_range()
can check it correctly.

Fixes: commit 45408c4f9250 ("tracing: kprobes: Prohibit probing on notrace function")
Signed-off-by: Masami Hiramatsu <>
Reported-by: Michael Rodin <>
 kernel/trace/trace_kprobe.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 65a4157af851..ad384b31fe01 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -513,7 +513,14 @@ static bool within_notrace_func(struct trace_kprobe *tk)
 	if (!addr || !kallsyms_lookup_size_offset(addr, &size, &offset))
 		return false;
-	return !ftrace_location_range(addr - offset, addr - offset + size);
+	/* Get the entry address of the target function */
+	addr -= offset;
+	/*
+	 * Since ftrace_location_range() does inclusive range check, we need
+	 * to subtract 1 byte from the end address.
+	 */
+	return !ftrace_location_range(addr, addr + size - 1);
 #define within_notrace_func(tk)	(false)

       reply	other threads:[~2018-08-21 13:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <>
2018-08-21 13:04 ` Masami Hiramatsu [this message]
2018-08-21 13:42   ` [BUGFIX PATCH] tracing/kprobes: Fix to check notrace function with correct range Steven Rostedt
2018-08-22 12:58     ` Steven Rostedt
2018-08-23  1:18       ` Masami Hiramatsu
2018-08-23  1:39         ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=153485669706.16611.17726752296213785504.stgit@devbox \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).