lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf top: Fix error handling in cmd_top()
    Commit-ID:  70c819e4bf1c5f492768b399d898d458ccdad2b6
    Gitweb: https://git.kernel.org/tip/70c819e4bf1c5f492768b399d898d458ccdad2b6
    Author: Changbin Du <changbin.du@gmail.com>
    AuthorDate: Sat, 16 Mar 2019 16:05:48 +0800
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Tue, 19 Mar 2019 16:52:04 -0300

    perf top: Fix error handling in cmd_top()

    We should go to the cleanup path, to avoid leaks, detected using gcc's
    ASan.

    Signed-off-by: Changbin Du <changbin.du@gmail.com>
    Reviewed-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/20190316080556.3075-9-changbin.du@gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-top.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index 614f278235fa..2508a7a552fa 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -1617,8 +1617,9 @@ int cmd_top(int argc, const char **argv)
    annotation_config__init();

    symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);
    - if (symbol__init(NULL) < 0)
    - return -1;
    + status = symbol__init(NULL);
    + if (status < 0)
    + goto out_delete_evlist;

    sort__setup_elide(stdout);

    \
     
     \ /
      Last update: 2019-03-22 23:30    [W:2.545 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site