projects/linux·commit 2d2fe9fd

Merge tag 'probes-fixes-v7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

2d2fe9fd · Linus Torvalds <[email protected]> · 2026-10-16 14:25:25 -10:00

Pull probes fix from Masami Hiramatsu:

 - error out if BTF is required but unavailable

   Fix to return an error instead of NULL if BTF is not available when
   user specify '$args*' meta fetch argument for probe events.

* tag 'probes-fixes-v7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: probes: error if BTF is required but unavailable
Commit
2d2fe9fd50b57fc2563f4b7bd2fe83906f79c81a
Parents
70dd4ee7 · 66c65803

Merge commit. Changes below are compared with the first parent: 70dd4ee7.

Changes

1 files changed · +1 −2

FileStatusAddDelContent
kernel/trace/trace_probe.cmodified+1−2View file

kernel/trace/trace_probe.c

View file
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 804442b..88518c5 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -2287,7 +2287,6 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[],
int *new_argc, char *buf, int bufsize,
struct traceprobe_parse_context *ctx)
{
- const struct btf_param *params = NULL;
int i, j, n, used, ret, args_idx = -1;
const char **new_argv __free(kfree) = NULL;
@@ -2305,7 +2304,7 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[],
if (args_idx != -1) {
/* $arg* requires BTF info */
trace_probe_log_err(0, NOSUP_BTFARG);
- return (const char **)params;
+ return ERR_PTR(-EOPNOTSUPP);
}
*new_argc = argc;
return NULL;