lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 383/477] perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
    Date
    From: Gaurav Singh <gaurav1086@gmail.com>

    [ Upstream commit 11b6e5482e178055ec1f2444b55f2518713809d1 ]

    The 'evname' variable can be NULL, as it is checked a few lines back,
    check it before using.

    Fixes: 9e207ddfa207 ("perf report: Show call graph from reference events")
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lore.kernel.org/lkml/
    Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/builtin-report.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index 26d8fc27e427e..fc7855262162d 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -476,8 +476,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report
    if (rep->time_str)
    ret += fprintf(fp, " (time slices: %s)", rep->time_str);

    - if (symbol_conf.show_ref_callgraph &&
    - strstr(evname, "call-graph=no")) {
    + if (symbol_conf.show_ref_callgraph && evname && strstr(evname, "call-graph=no")) {
    ret += fprintf(fp, ", show reference callgraph");
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:17    [W:4.069 / U:1.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site