[GIT PULL] probes: Fixes for v7.3-rc7

[Google]

Hi Linus,

Probes fixes for v7.3-rc7:

- tracing: probes: error 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.


Please pull the latest probes-fixes-v7.3-rc7 tree, which can be found at:


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

Tag SHA1: c66008d494387045766f3bf87c3feecdc3fc0423
Head SHA1: 66c658033d842bb75f81f20aaa4a378fe47be1a1


Martin Kaiser (1):
      tracing: probes: error if BTF is required but unavailable

----
 kernel/trace/trace_probe.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---------------------------
commit 66c658033d842bb75f81f20aaa4a378fe47be1a1
Author: Martin Kaiser <martin@xxxxxxxxx>
Date:   Wed Oct 14 10:37:40 2026 +0200

    tracing: probes: error if BTF is required but unavailable
    
    traceprobe_expand_meta_args expands probe arguments based on BTF info.
    
    Return an error if we have arguments that need expanding but BTF is not
    supported.
    
    The params variable is now unused, it can be removed.
    
    Link: https://lore.kernel.org/all/20261014083838.31020-1-martin@xxxxxxxxx/
    
    Fixes: d157d7694460 ("tracing/probes: Support BTF field access from $retval")
    Signed-off-by: Martin Kaiser <martin@xxxxxxxxx>
    Reviewed-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 804442b2f7d2..88518c5322a5 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;