Merge tag 'probes-fixes-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

torvalds · torvalds · commit e2291551827f · 2025-07-16T13:00:38.000-07:00
Pull probes fix from Masami Hiramatsu: - fprobe-event: The @params variable was being used in an error path without being initialized. The fix to return an error code. * tag 'probes-fixes-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/probes: Avoid using params uninitialized in parse_btf_arg()
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
@@ -657,7 +657,7 @@ static int parse_btf_arg(char *varname,
 		ret = query_btf_context(ctx);
 		if (ret < 0 || ctx->nr_params == 0) {
 			trace_probe_log_err(ctx->offset, NO_BTF_ENTRY);
-			return PTR_ERR(params);
+			return -ENOENT;
 		}
 	}
 	params = ctx->params;

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ static int parse_btf_arg(char *varname,`
`657`	`657`	`ret = query_btf_context(ctx);`
`658`	`658`	`if (ret < 0 \|\| ctx->nr_params == 0) {`
`659`	`659`	`trace_probe_log_err(ctx->offset, NO_BTF_ENTRY);`
`660`		`- return PTR_ERR(params);`
	`660`	`+ return -ENOENT;`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`	`params = ctx->params;`