Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dce2ce3 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Handle failure case in trace_report() 



If pevent allocation in read_trace_init() fails, trace_report() will
return -1 and *ppevent is set to NULL.  Its callers should check this
case and handle it properly.

This is also a preparation for the removal of *die() calls.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1363850332-25297-6-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7f42b950

tools/perf/util/header.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -1670,8 +1670,8 @@ static int process_tracing_data(struct perf_file_section *section __maybe_unused 
				struct perf_header *ph __maybe_unused,

				struct perf_header *ph __maybe_unused,

				int fd, void *data)

				int fd, void *data)

{

{

	trace_report(fd, data, false);

	ssize_t ret = trace_report(fd, data, false);

	return 0;

	return ret < 0 ? -1 : 0;

}

}





static int process_build_id(struct perf_file_section *section,

static int process_build_id(struct perf_file_section *section,
@@ -2750,6 +2750,11 @@ static int perf_evsel__prepare_tracepoint_event(struct perf_evsel *evsel, 
	if (evsel->tp_format)

	if (evsel->tp_format)

		return 0;

		return 0;





	if (pevent == NULL) {

		pr_debug("broken or missing trace data\n");

		return -1;

	}



	event = pevent_find_event(pevent, evsel->attr.config);

	event = pevent_find_event(pevent, evsel->attr.config);

	if (event == NULL)

	if (event == NULL)

		return -1;

		return -1;

tools/perf/util/trace-event-read.c

+24 −17
Original line number Original line Diff line number Diff line
@@ -291,7 +291,10 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) 
	int show_version = 0;

	int show_version = 0;

	int show_funcs = 0;

	int show_funcs = 0;

	int show_printk = 0;

	int show_printk = 0;

	ssize_t size;

	ssize_t size = -1;

	struct pevent *pevent;



	*ppevent = NULL;





	calc_data_size = 1;

	calc_data_size = 1;

	repipe = __repipe;

	repipe = __repipe;
@@ -315,34 +318,38 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe) 
	file_bigendian = buf[0];

	file_bigendian = buf[0];

	host_bigendian = bigendian();

	host_bigendian = bigendian();





	*ppevent = read_trace_init(file_bigendian, host_bigendian);

	pevent = read_trace_init(file_bigendian, host_bigendian);

	if (*ppevent == NULL)

	if (pevent == NULL) {

		die("read_trace_init failed");

		pr_debug("read_trace_init failed");

		goto out;

	}





	read_or_die(buf, 1);

	read_or_die(buf, 1);

	long_size = buf[0];

	long_size = buf[0];





	page_size = read4(*ppevent);

	page_size = read4(pevent);





	read_header_files(*ppevent);

	read_header_files(pevent);



	read_ftrace_files(pevent);

	read_ftrace_files(*ppevent);

	read_event_files(pevent);

	read_event_files(*ppevent);

	read_proc_kallsyms(pevent);

	read_proc_kallsyms(*ppevent);

	read_ftrace_printk(pevent);

	read_ftrace_printk(*ppevent);





	size = calc_data_size - 1;

	size = calc_data_size - 1;

	calc_data_size = 0;

	calc_data_size = 0;

	repipe = false;

	repipe = false;





	if (show_funcs) {

	if (show_funcs) {

		pevent_print_funcs(*ppevent);

		pevent_print_funcs(pevent);

		return size;

	} else if (show_printk) {

	}

		pevent_print_printk(pevent);

	if (show_printk) {

		pevent_print_printk(*ppevent);

		return size;

	}

	}





	*ppevent = pevent;

	pevent = NULL;



out:

	if (pevent)

		pevent_free(pevent);

	return size;

	return size;

}
 
}