Commit 288a4b91 authored Oct 16, 2014 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Oct 29, 2014

perf tools: Fix report -F dso_from for data without branch info



The branch field sorting code assumes hist_entry::branch_info is
allocated, which is wrong and following perf session ends up with report
segfault.

  $ perf record ls
  $ perf report -F dso_from
  perf: Segmentation fault

Checking that hist_entry::branch_info is valid and display "N/A" string
in snprint callback if it's not.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1413468427-31049-8-git-send-email-jolsa@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 8b62fa59

tools/perf/util/sort.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -373,6 +373,9 @@ struct sort_entry sort_cpu = {
		static int64_t
		sort__dso_from_cmp(struct hist_entry left, struct hist_entry right)
		{
		if (!left->branch_info \|\| !right->branch_info)
		return cmp_null(left->branch_info, right->branch_info);

		return _sort__dso_cmp(left->branch_info->from.map,
		right->branch_info->from.map);
		}
		@@ -380,8 +383,11 @@ sort__dso_from_cmp(struct hist_entry left, struct hist_entry right)
		static int hist_entry__dso_from_snprintf(struct hist_entry he, char bf,
		size_t size, unsigned int width)
		{
		if (he->branch_info)
		return _hist_entry__dso_snprintf(he->branch_info->from.map,
		bf, size, width);
		else
		return repsep_snprintf(bf, size, "%-.s", width, width, "N/A");
		}

		static int64_t

Admin message