Skip to content

Commit 2c17a1c

Browse files
committed
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()
2 parents e92b99a + dce3696 commit 2c17a1c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/trace/trace_probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,7 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size,
14661466
parg->fmt = kmalloc(len, GFP_KERNEL);
14671467
if (!parg->fmt) {
14681468
ret = -ENOMEM;
1469-
goto out;
1469+
goto fail;
14701470
}
14711471
snprintf(parg->fmt, len, "%s[%d]", parg->type->fmttype,
14721472
parg->count);

0 commit comments

Comments
 (0)