Merge tag 'trace-v4.18-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull kprobe fix from Steven Rostedt:
 "This fixes a memory leak in the kprobe code"

* tag 'trace-v4.18-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobe: Release kprobe print_fmt properly

1 files changed, 5 insertions, 1 deletions

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index daa81571b22a..21f718472942 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1480,8 +1480,10 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
         }
 
         ret = __register_trace_kprobe(tk);
-        if (ret < 0)
+        if (ret < 0) {
+                kfree(tk->tp.call.print_fmt);
                 goto error;
+        }
 
         return &tk->tp.call;
 error:
@@ -1501,6 +1503,8 @@ void destroy_local_trace_kprobe(struct trace_event_call *event_call)
         }
 
         __unregister_trace_kprobe(tk);
+
+        kfree(tk->tp.call.print_fmt);
         free_trace_kprobe(tk);
 }
 #endif /* CONFIG_PERF_EVENTS */