Commit e2291551 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.16-rc6' of... 

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

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()
parents 4664a4dd 1ed171a3

kernel/trace/trace_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -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;