linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: treeze.taeung@gmail.com, acme@redhat.com, hpa@zytor.com,
	mhiramat@kernel.org, linux-kernel@vger.kernel.org,
	jolsa@kernel.org, peterz@infradead.org, namhyung@kernel.org,
	alexander.shishkin@linux.intel.com, mingo@kernel.org,
	tglx@linutronix.de
Subject: [tip:perf/core] perf config: Constructor should free its allocated memory when failing
Date: Wed, 8 Jun 2016 01:44:54 -0700	[thread overview]
Message-ID: <tip-25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6@git.kernel.org> (raw)
In-Reply-To: <1465291577-20973-2-git-send-email-treeze.taeung@gmail.com>

Commit-ID:  25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6
Gitweb:     http://git.kernel.org/tip/25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Tue, 7 Jun 2016 18:26:11 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 7 Jun 2016 10:58:55 -0300

perf config: Constructor should free its allocated memory when failing

Because of die() at perf_parse_file() a config set was freed in
collect_config(), if failed.  But it is natural to free a config set
after collect_config() is done when some problems happened.

So, in case of failure, lastly free a config set at perf_config_set__new()
instead of freeing the config set in collect_config().

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1465291577-20973-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/config.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index c73f1c4..e086f59 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -643,7 +643,6 @@ static int collect_config(const char *var, const char *value,
 
 out_free:
 	free(key);
-	perf_config_set__delete(set);
 	return -1;
 }
 
@@ -653,7 +652,10 @@ struct perf_config_set *perf_config_set__new(void)
 
 	if (set) {
 		INIT_LIST_HEAD(&set->sections);
-		perf_config(collect_config, set);
+		if (perf_config(collect_config, set) < 0) {
+			perf_config_set__delete(set);
+			set = NULL;
+		}
 	}
 
 	return set;

  reply	other threads:[~2016-06-08  8:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07  9:26 [RFC][PATCH v7 0/9] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-06-07  9:26 ` [BUGFIX][PATCH v7 1/7] perf config: If collect_config() is failed, finally free a config set after it is done Taeung Song
2016-06-08  8:44   ` tip-bot for Taeung Song [this message]
2016-06-07  9:26 ` [PATCH v7 2/7] perf config: Use new perf_config_set__init() to initialize config set Taeung Song
2016-06-08  8:45   ` [tip:perf/core] " tip-bot for Taeung Song
2016-06-07  9:26 ` [PATCH v7 3/7] perf config: Add global variable 'config_set' Taeung Song
2016-06-07 14:05   ` Arnaldo Carvalho de Melo
2016-06-07 15:14     ` Taeung Song
2016-06-08 12:38       ` Taeung Song
2016-06-07  9:26 ` [PATCH v7 4/7] perf config: Use zfree() instead of free() at perf_config_set__delete() Taeung Song
2016-06-07  9:26 ` [PATCH v7 5/7] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-06-07  9:26 ` [PATCH v7 6/7] perf config: Reset the config set at only 'config' sub-command Taeung Song
2016-06-07  9:26 ` [PATCH v7 7/7] perf config: Reimplement show_config() using perf_config() Taeung Song

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=tip-25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=treeze.taeung@gmail.com \
    --subject='Re: [tip:perf/core] perf config: Constructor should free its allocated memory when failing' \
    /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

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).