[GIT PULL][PATCH] tracing/kprobe: Release kprobe print_fmt properly

[Steven Rostedt]

Linus,

This fixes a memory leak in the kprobe code.


Please pull the latest trace-v4.18-rc3-2 tree, which can be found at:


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

Tag SHA1: 2dc4f4a15fc23494d3fe5af7e1598923825d5da9
Head SHA1: 0fc8c3581dd42bc8f530314ca86db2d861485731


Jiri Olsa (1):
      tracing/kprobe: Release kprobe print_fmt properly

----
 kernel/trace/trace_kprobe.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---------------------------
commit 0fc8c3581dd42bc8f530314ca86db2d861485731
Author: Jiri Olsa <jo...@kernel.org>
Date:   Mon Jul 9 16:19:06 2018 +0200

    tracing/kprobe: Release kprobe print_fmt properly
    
    We don't release tk->tp.call.print_fmt when destroying
    local uprobe. Also there's missing print_fmt kfree in
    create_local_trace_kprobe error path.
    
    Link: http://lkml.kernel.org/r/20180709141906.2390-1-jo...@kernel.org
    
    Cc: sta...@vger.kernel.org
    Fixes: e12f03d7031a ("perf/core: Implement the 'perf_kprobe' PMU")
    Acked-by: Song Liu <songliubrav...@fb.com>
    Acked-by: Masami Hiramatsu <mhira...@kernel.org>
    Signed-off-by: Jiri Olsa <jo...@kernel.org>
    Signed-off-by: Steven Rostedt (VMware) <rost...@goodmis.org>

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 */