From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753092AbcEJUgV (ORCPT ); Tue, 10 May 2016 16:36:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58432 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbcEJUgS (ORCPT ); Tue, 10 May 2016 16:36:18 -0400 Date: Tue, 10 May 2016 13:35:44 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: acme@redhat.com, mhiramat@kernel.org, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, mhiramat@kernel.org, acme@redhat.com In-Reply-To: <20160510054744.6158.37810.stgit@devbox> References: <20160510054744.6158.37810.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf pmu: Make pmu_formats_string to check return value of strbuf Git-Commit-ID: 11db4e29bb50442ecef2173f325b7be4e7790025 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 11db4e29bb50442ecef2173f325b7be4e7790025 Gitweb: http://git.kernel.org/tip/11db4e29bb50442ecef2173f325b7be4e7790025 Author: Masami Hiramatsu AuthorDate: Tue, 10 May 2016 14:47:44 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 10 May 2016 11:57:52 -0300 perf pmu: Make pmu_formats_string to check return value of strbuf Make pmu_formats_string() to check return value of strbuf APIs so that it can detect errors in it. Signed-off-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20160510054744.6158.37810.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- 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 bf34468..ddb0261 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;