Commit 2c17a1cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull probes fix from Masami Hiramatsu:

 - probe-events: Fix memory leak in parsing probe argument.

   There is a memory leak (forget to free an allocated buffer) in a
   memory allocation failure path. Fix it to jump to the correct error
   handling code.

* tag 'probes-fixes-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/probes: Fix memory leak in traceprobe_parse_probe_arg_body()
parents e92b99ae dce36962

kernel/trace/trace_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, 
		parg->fmt = kmalloc(len, GFP_KERNEL);

		if (!parg->fmt) {

			ret = -ENOMEM;

			goto out;

			goto fail;

		}

		snprintf(parg->fmt, len, "%s[%d]", parg->type->fmttype,

			 parg->count);