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

Commit ce47dc56 authored by Chris Samuel's avatar Chris Samuel Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Catch a few uncheck calloc/malloc's 



There were a few stray calloc()'s and malloc()'s which were not having
their return values checked for success.

As the calling code either already coped with failure or didn't actually
care we just return -ENOMEM at that point.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarChris Samuel <chris@csamuel.org>
LKML-Reference: <4CDDF95A.1050400@csamuel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 965bb6be

tools/perf/builtin-kmem.c

+3 −0
Original line number Diff line number Diff line
@@ -736,6 +736,9 @@ static int __cmd_record(int argc, const char **argv) 
	rec_argc = ARRAY_SIZE(record_args) + argc - 1;

	rec_argv = calloc(rec_argc + 1, sizeof(char *));



	if (rec_argv == NULL)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(record_args); i++)

		rec_argv[i] = strdup(record_args[i]);

tools/perf/builtin-lock.c

+3 −0
Original line number Diff line number Diff line
@@ -943,6 +943,9 @@ static int __cmd_record(int argc, const char **argv) 
	rec_argc = ARRAY_SIZE(record_args) + argc - 1;

	rec_argv = calloc(rec_argc + 1, sizeof(char *));



	if (rec_argv == NULL)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(record_args); i++)

		rec_argv[i] = strdup(record_args[i]);

tools/perf/builtin-sched.c

+3 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,9 @@ static int __cmd_record(int argc, const char **argv) 
	rec_argc = ARRAY_SIZE(record_args) + argc - 1;

	rec_argv = calloc(rec_argc + 1, sizeof(char *));



	if (rec_argv)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(record_args); i++)

		rec_argv[i] = strdup(record_args[i]);

tools/perf/builtin-timechart.c

+3 −0
Original line number Diff line number Diff line
@@ -989,6 +989,9 @@ static int __cmd_record(int argc, const char **argv) 
	rec_argc = ARRAY_SIZE(record_args) + argc - 1;

	rec_argv = calloc(rec_argc + 1, sizeof(char *));



	if (rec_argv == NULL)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(record_args); i++)

		rec_argv[i] = strdup(record_args[i]);

tools/perf/util/header.c

+3 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,9 @@ int event__synthesize_attr(struct perf_event_attr *attr, u16 ids, u64 *id, 


	ev = malloc(size);



	if (ev == NULL)

		return -ENOMEM;



	ev->attr.attr = *attr;

	memcpy(ev->attr.id, id, ids * sizeof(u64));