linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 13/15] perf pmu: Make pmu_formats_string to check return value of strbuf
Date: Tue, 10 May 2016 12:15:23 -0300	[thread overview]
Message-ID: <1462893325-28646-14-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1462893325-28646-1-git-send-email-acme@kernel.org>

From: Masami Hiramatsu <mhiramat@kernel.org>

Make pmu_formats_string() to check 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/20160510054744.6158.37810.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/pmu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index bf34468a99cb..ddb0261b2577 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -643,20 +643,20 @@ static int pmu_resolve_param_term(struct parse_events_term *term,
 static char *pmu_formats_string(struct list_head *formats)
 {
 	struct perf_pmu_format *format;
-	char *str;
-	struct strbuf buf;
+	char *str = NULL;
+	struct strbuf buf = STRBUF_INIT;
 	unsigned i = 0;
 
 	if (!formats)
 		return NULL;
 
-	strbuf_init(&buf, 0);
 	/* sysfs exported terms */
 	list_for_each_entry(format, formats, list)
-		strbuf_addf(&buf, i++ ? ",%s" : "%s",
-			    format->name);
+		if (strbuf_addf(&buf, i++ ? ",%s" : "%s", format->name) < 0)
+			goto error;
 
 	str = strbuf_detach(&buf, NULL);
+error:
 	strbuf_release(&buf);
 
 	return str;
-- 
2.5.5

  parent reply	other threads:[~2016-05-10 15:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10 15:15 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 01/15] perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 02/15] perf stat: Scale values by unit before metrics Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 03/15] perf script: Fix incorrect python db-export error message Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 04/15] perf tools: Support reading from backward ring buffer Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 05/15] perf tests: Add test to check " Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 06/15] perf evsel: Print state of perf_event_attr.write_backward Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 07/15] perf symbols: Fix handling of zero-length symbols Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 08/15] perf tools: Rewrite strbuf not to die() Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 09/15] perf probe: Check the return value of strbuf APIs Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 10/15] perf help: Make check_emacsclient_version to check " Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 11/15] perf tools: Make alias handler to check return value of strbuf Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 12/15] perf header: Make topology checkers " Arnaldo Carvalho de Melo
2016-05-10 15:15 ` Arnaldo Carvalho de Melo [this message]
2016-05-10 15:15 ` [PATCH 14/15] perf help: Do not use ALLOC_GROW in add_cmd_list Arnaldo Carvalho de Melo
2016-05-10 15:15 ` [PATCH 15/15] perf tools: Remove xrealloc and ALLOC_GROW Arnaldo Carvalho de Melo
2016-05-10 20:28 ` [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462893325-28646-14-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).