TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing/kprobe: Fix kprobe_on_func_entry() modification

Browse Source 
The commit 960434acef ("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: 960434acef ("tracing/kprobe: Fix to support kretprobe events on unloaded modules")
Signed-off-by: Li Huafei <lihuafei1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Li Huafei
2021-09-24 10:54:48 +08:00
committed by Greg Kroah-Hartman
parent 320dc471c4
commit 6cfbbb961b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trace/trace_kprobe.c
View File

@@ -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;
}