From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756902AbcEEX5B (ORCPT ); Thu, 5 May 2016 19:57:01 -0400 Received: from mail.kernel.org ([198.145.29.136]:41362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbcEEX5A (ORCPT ); Thu, 5 May 2016 19:57:00 -0400 Date: Thu, 5 May 2016 20:56:56 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Peter Zijlstra , Ingo Molnar Subject: Re: [PATCH perf/core v2 6/8] perf pmu: Make pmu_formats_string to check return value of strbuf Message-ID: <20160505235656.GQ11069@kernel.org> References: <20160429150941.30063.62888.stgit@devbox> <20160429151042.30063.69553.stgit@devbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160429151042.30063.69553.stgit@devbox> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sat, Apr 30, 2016 at 12:10:42AM +0900, Masami Hiramatsu escreveu: > Make pmu_formats_string() to check return value of > strbuf APIs so that it can detect errors in it. > > Signed-off-by: Masami Hiramatsu > --- > 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; Ok, here you use STRBUF_INIT and you removed the equivalent (I guess) call to strbuf_init(&buf, 0) below, i.e. there will be no alloc the check. Looks ok. > 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;