From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B460BC433DF for ; Thu, 21 May 2020 17:07:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9292920826 for ; Thu, 21 May 2020 17:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590080833; bh=OtwlfFmNQgc80UjNIdcExbJwJxfb18Gjc2AQYQZ4KCA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=QE26gnuDKrUUlcppeoKwmL9ipgc6sWOTdDwisc0KrwyxIlriXBpME+07xepnznrVl D0phkdy07lJaUoPrtjvwdJpLpKYnjME04ftXK0zC+B+a3kXkYBSbrzpR3McjV4swOf 9LA/UTf+hFz1kg7if0OC/bdrAhzCM7o4yrDOGAaM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728673AbgEURHJ (ORCPT ); Thu, 21 May 2020 13:07:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:42254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728565AbgEURHH (ORCPT ); Thu, 21 May 2020 13:07:07 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E8D9820759; Thu, 21 May 2020 17:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590080827; bh=OtwlfFmNQgc80UjNIdcExbJwJxfb18Gjc2AQYQZ4KCA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jX0v0UwvZ+soIo2gh1lmoddPZuETI8kS51MBmggNIbQ9bOOYSEpLfGRMWUN8bwbeX MjIzR+Dhfv4VmR1xNymBIMekvXeOOoPzHgjCkp5s0Qv/BOCOf+BPxKLF3ai+Cfq/tn Peze1O6CrD7GOjqV+bpFAKppYK+iHzATNC65OtsY= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id DB22F40AFD; Thu, 21 May 2020 14:07:04 -0300 (-03) Date: Thu, 21 May 2020 14:07:04 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Kajol Jain , Andi Kleen , John Garry , Jin Yao , Kan Liang , Cong Wang , Kim Phillips , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, Vince Weaver , Stephane Eranian Subject: Re: [RFC PATCH v3 09/14] perf metricgroup: free metric_events on error Message-ID: <20200521170704.GC14034@kernel.org> References: <20200508053629.210324-1-irogers@google.com> <20200508053629.210324-10-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200508053629.210324-10-irogers@google.com> X-Url: http://acmel.wordpress.com Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Em Thu, May 07, 2020 at 10:36:24PM -0700, Ian Rogers escreveu: > Avoid a simple memory leak. Thanks, applied. - Arnaldo > Signed-off-by: Ian Rogers > --- > tools/perf/util/metricgroup.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index 4f7e36bc49d9..7e1725d61c39 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -186,6 +186,7 @@ static int metricgroup__setup_events(struct list_head *groups, > if (!evsel) { > pr_debug("Cannot resolve %s: %s\n", > eg->metric_name, eg->metric_expr); > + free(metric_events); > continue; > } > for (i = 0; metric_events[i]; i++) > @@ -193,11 +194,13 @@ static int metricgroup__setup_events(struct list_head *groups, > me = metricgroup__lookup(metric_events_list, evsel, true); > if (!me) { > ret = -ENOMEM; > + free(metric_events); > break; > } > expr = malloc(sizeof(struct metric_expr)); > if (!expr) { > ret = -ENOMEM; > + free(metric_events); > break; > } > expr->metric_expr = eg->metric_expr; > -- > 2.26.2.645.ge9eca65c58-goog > -- - Arnaldo