[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20210924025448.232959-1-lihuafei1@huawei.com>
Date: Fri, 24 Sep 2021 10:54:48 +0800
From: Li Huafei <lihuafei1@...wei.com>
To: <gregkh@...uxfoundation.org>
CC: <mhiramat@...nel.org>, <rostedt@...dmis.org>, <mingo@...hat.com>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH 4.19] tracing/kprobe: Fix kprobe_on_func_entry() modification
The commit 960434acef37 ("tracing/kprobe: Fix to support kretprobe
events on unloaded modules") backport from v5.11, which modifies the
return value of kprobe_on_func_entry(). However, there is no adaptation
modification in create_trace_kprobe(), resulting in the exact opposite
behavior. Now we need to return an error immediately only if
kprobe_on_func_entry() returns -EINVAL.
Fixes: 960434acef37 ("tracing/kprobe: Fix to support kretprobe events on unloaded modules")
Signed-off-by: Li Huafei <lihuafei1@...wei.com>
---
kernel/trace/trace_kprobe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 61eff45653f5..36dfea29d5fa 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -836,8 +836,9 @@ static int create_trace_kprobe(int argc, char **argv)
pr_info("Failed to parse either an address or a symbol.\n");
return ret;
}
+ /* Defer the ENOENT case until register kprobe */
if (offset && is_return &&
- !kprobe_on_func_entry(NULL, symbol, offset)) {
+ kprobe_on_func_entry(NULL, symbol, offset) == -EINVAL) {
pr_info("Given offset is not valid for return probe.\n");
return -EINVAL;
}
--
2.17.1
Powered by blists - more mailing lists