diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:27:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-30 11:27:22 -0700 |
| commit | b0b9850e7d53aec13ef12a485e5a301774d9132e (patch) | |
| tree | f2a08467247441371ca35bee561edb0e4af59187 /tools | |
| parent | 98a05fe8cd5e0afe2b4c52b5013b53c44d615148 (diff) | |
| parent | de02f2ac5d8cfb311f44f2bf144cc20002f1fbbd (diff) | |
| download | linux-b0b9850e7d53aec13ef12a485e5a301774d9132e.tar.gz linux-b0b9850e7d53aec13ef12a485e5a301774d9132e.tar.bz2 linux-b0b9850e7d53aec13ef12a485e5a301774d9132e.zip | |
Merge tag 'probes-fixes-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probe fixes from Masami Hiramatsu:
- probe-events: add NULL check for some BTF API calls which can return
error code and NULL.
- ftrace selftests: check fprobe and kprobe event correctly. This fixes
a miss condition of the test command.
- kprobes: do not allow probing functions that start with "__cfi_" or
"__pfx_" since those are auto generated for kernel CFI and not
executed.
* tag 'probes-fixes-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
kprobes: Prohibit probing on CFI preamble symbol
selftests/ftrace: Fix to check fprobe event eneblement
tracing/probes: Fix to add NULL check for BTF APIs
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc index b89de1771655..f34b14ef9781 100644 --- a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc +++ b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc @@ -13,7 +13,7 @@ if grep -qF "f[:[<group>/][<event>]] <func-name>[%return] [<args>]" README ; the FPROBES=yes fi -if [ -z "$KPROBES" -a "$FPROBES" ] ; then +if [ -z "$KPROBES" -a -z "$FPROBES" ] ; then exit_unsupported fi |