From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748AbbF3LOw (ORCPT ); Tue, 30 Jun 2015 07:14:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45063 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800AbbF3LOq (ORCPT ); Tue, 30 Jun 2015 07:14:46 -0400 Date: Tue, 30 Jun 2015 13:14:43 +0200 From: Jiri Olsa To: Taeung Song Cc: Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org, namhyung@kernel.org, Ingo Molnar Subject: Re: [PATCH 3/5] perf kvm: Fill in the missing freeing a session after an error occur Message-ID: <20150630111443.GA25631@krava.brq.redhat.com> References: <1435652124-22414-1-git-send-email-treeze.taeung@gmail.com> <1435652124-22414-4-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435652124-22414-4-git-send-email-treeze.taeung@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 30, 2015 at 05:15:22PM +0900, Taeung Song wrote: > When an error occur a error value is just returned > without freeing the session. So allocating and freeing > session have to be matched as a pair even if an error occur. > > Signed-off-by: Taeung Song > --- > tools/perf/builtin-kvm.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c > index 74878cd..5fa96a0 100644 > --- a/tools/perf/builtin-kvm.c > +++ b/tools/perf/builtin-kvm.c > @@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm) > > symbol__init(&kvm->session->header.env); > > - if (!perf_session__has_traces(kvm->session, "kvm record")) > - return -EINVAL; > + if (!perf_session__has_traces(kvm->session, "kvm record")) { > + ret = -EINVAL; > + goto out_delete; > + } > > /* > * Do not use 'isa' recorded in kvm_exit tracepoint since it is not > @@ -1070,9 +1072,15 @@ static int read_events(struct perf_kvm_stat *kvm) > */ > ret = cpu_isa_config(kvm); > if (ret < 0) > - return ret; > + goto out_delete; > > - return perf_session__process_events(kvm->session); > + ret = perf_session__process_events(kvm->session); > + if (ret < 0) > + goto out_delete; above 2 lines are not needed.. just fall through jirka > + > +out_delete: > + perf_session__delete(kvm->session); > + return ret; > } > > static int parse_target_str(struct perf_kvm_stat *kvm) > -- > 1.9.1 >