linux-kernel - [tip:perf/core] perf config: Constructor should free its allocated memory when failing

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 8 Jun 2016 01:44:54 -0700
From:	tip-bot for Taeung Song <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	treeze.taeung@...il.com, acme@...hat.com, hpa@...or.com,
	mhiramat@...nel.org, linux-kernel@...r.kernel.org,
	jolsa@...nel.org, peterz@...radead.org, namhyung@...nel.org,
	alexander.shishkin@...ux.intel.com, mingo@...nel.org,
	tglx@...utronix.de
Subject: [tip:perf/core] perf config: Constructor should free its allocated
 memory when failing

Commit-ID:  25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6
Gitweb:     http://git.kernel.org/tip/25d8f48f78f37dd6af08bd11212ab3d53a4c8cc6
Author:     Taeung Song <treeze.taeung@...il.com>
AuthorDate: Tue, 7 Jun 2016 18:26:11 +0900
Committer:  Arnaldo Carvalho de Melo <acme@...hat.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@...il.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.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@...hat.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;