Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1398209

[PATCH 12/15] perf header: Make topology checkers to check return value of strbuf

Show all headers | View raw

From: Masami Hiramatsu <mhiramat@kernel.org>

Make topology checkers to check the return value of strbuf APIs so that
it can detect errors in it.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160510054735.6158.98650.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/header.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 90680ec9f8b8..c6000d44f98c 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1819,7 +1819,8 @@ static int process_cpu_topology(struct perf_file_section *section,
 
 	ph->env.nr_sibling_cores = nr;
 	size += sizeof(u32);
-	strbuf_init(&sb, 128);
+	if (strbuf_init(&sb, 128) < 0)
+		goto free_cpu;
 
 	for (i = 0; i < nr; i++) {
 		str = do_read_string(fd, ph);
@@ -1827,7 +1828,8 @@ static int process_cpu_topology(struct perf_file_section *section,
 			goto error;
 
 		/* include a NULL character at the end */
-		strbuf_add(&sb, str, strlen(str) + 1);
+		if (strbuf_add(&sb, str, strlen(str) + 1) < 0)
+			goto error;
 		size += string_size(str);
 		free(str);
 	}
@@ -1849,7 +1851,8 @@ static int process_cpu_topology(struct perf_file_section *section,
 			goto error;
 
 		/* include a NULL character at the end */
-		strbuf_add(&sb, str, strlen(str) + 1);
+		if (strbuf_add(&sb, str, strlen(str) + 1) < 0)
+			goto error;
 		size += string_size(str);
 		free(str);
 	}
@@ -1912,13 +1915,14 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
 	/* nr nodes */
 	ret = readn(fd, &nr, sizeof(nr));
 	if (ret != sizeof(nr))
-		goto error;
+		return -1;
 
 	if (ph->needs_swap)
 		nr = bswap_32(nr);
 
 	ph->env.nr_numa_nodes = nr;
-	strbuf_init(&sb, 256);
+	if (strbuf_init(&sb, 256) < 0)
+		return -1;
 
 	for (i = 0; i < nr; i++) {
 		/* node number */
@@ -1940,15 +1944,17 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
 			mem_free = bswap_64(mem_free);
 		}
 
-		strbuf_addf(&sb, "%u:%"PRIu64":%"PRIu64":",
-			    node, mem_total, mem_free);
+		if (strbuf_addf(&sb, "%u:%"PRIu64":%"PRIu64":",
+				node, mem_total, mem_free) < 0)
+			goto error;
 
 		str = do_read_string(fd, ph);
 		if (!str)
 			goto error;
 
 		/* include a NULL character at the end */
-		strbuf_add(&sb, str, strlen(str) + 1);
+		if (strbuf_add(&sb, str, strlen(str) + 1) < 0)
+			goto error;
 		free(str);
 	}
 	ph->env.numa_nodes = strbuf_detach(&sb, NULL);
@@ -1982,7 +1988,8 @@ static int process_pmu_mappings(struct perf_file_section *section __maybe_unused
 	}
 
 	ph->env.nr_pmu_mappings = pmu_num;
-	strbuf_init(&sb, 128);
+	if (strbuf_init(&sb, 128) < 0)
+		return -1;
 
 	while (pmu_num) {
 		if (readn(fd, &type, sizeof(type)) != sizeof(type))
@@ -1994,9 +2001,11 @@ static int process_pmu_mappings(struct perf_file_section *section __maybe_unused
 		if (!name)
 			goto error;
 
-		strbuf_addf(&sb, "%u:%s", type, name);
+		if (strbuf_addf(&sb, "%u:%s", type, name) < 0)
+			goto error;
 		/* include a NULL character at the end */
-		strbuf_add(&sb, "", 1);
+		if (strbuf_add(&sb, "", 1) < 0)
+			goto error;
 
 		if (!strcmp(name, "msr"))
 			ph->env.msr_pmu_type = type;
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 09/15] perf probe: Check the return value of strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 04/15] perf tools: Support reading from backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 15/15] perf tools: Remove xrealloc and ALLOC_GROW Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 03/15] perf script: Fix incorrect python db-export error message Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 11/15] perf tools: Make alias handler to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 14/15] perf help: Do not use ALLOC_GROW in add_cmd_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 07/15] perf symbols: Fix handling of zero-length symbols. Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 12/15] perf header: Make topology checkers to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 05/15] perf tests: Add test to check backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 01/15] perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 06/15] perf evsel: Print state of perf_event_attr.write_backward Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 10/15] perf help: Make check_emacsclient_version to check strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 08/15] perf tools: Rewrite strbuf not to die() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 02/15] perf stat: Scale values by unit before metrics Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 13/15] perf pmu: Make pmu_formats_string to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  Re: [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-05-10 22:30 +0200

csiph-web