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

Commit a1834fc9 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf values: Zero value buffers 



We need to make sure the array of value pointers are zero initialized,
because we use them in realloc later on and uninitialized non zero value
will cause allocation error and aborted execution.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20170824162737.7813-9-jolsa@kernel.org


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

tools/perf/util/values.c

+7 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ int perf_read_values_init(struct perf_read_values *values) 
	values->threads_max = 16;

	values->pid = malloc(values->threads_max * sizeof(*values->pid));

	values->tid = malloc(values->threads_max * sizeof(*values->tid));

	values->value = malloc(values->threads_max * sizeof(*values->value));

	values->value = zalloc(values->threads_max * sizeof(*values->value));

	if (!values->pid || !values->tid || !values->value) {

		pr_debug("failed to allocate read_values threads arrays");

		goto out_free_pid;
@@ -99,7 +99,8 @@ static int perf_read_values__findnew_thread(struct perf_read_values *values, 
	}



	i = values->threads;

	values->value[i] = malloc(values->counters_max * sizeof(**values->value));



	values->value[i] = zalloc(values->counters_max * sizeof(**values->value));

	if (!values->value[i]) {

		pr_debug("failed to allocate read_values counters array");

		return -ENOMEM;
@@ -130,12 +131,16 @@ static int perf_read_values__enlarge_counters(struct perf_read_values *values) 


	for (i = 0; i < values->threads; i++) {

		u64 *value = realloc(values->value[i], counters_max * sizeof(**values->value));

		int j;



		if (!value) {

			pr_debug("failed to enlarge read_values ->values array");

			goto out_free_name;

		}



		for (j = values->counters_max; j < counters_max; j++)

			value[j] = 0;



		values->value[i] = value;

	}