[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-7db91f251056f90fec4121f028680ab3153a0f3c@git.kernel.org>
Date:	Wed, 8 Jun 2016 01:41:05 -0700
From:	tip-bot for Taeung Song <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, tglx@...utronix.de,
	mhiramat@...nel.org, acme@...hat.com, treeze.taeung@...il.com,
	peterz@...radead.org, alexander.shishkin@...ux.intel.com,
	mingo@...nel.org, jolsa@...hat.com, namhyung@...nel.org,
	hpa@...or.com
Subject: [tip:perf/core] perf config: Handle the error when config set is
 NULL at collect_config()
Commit-ID:  7db91f251056f90fec4121f028680ab3153a0f3c
Gitweb:     http://git.kernel.org/tip/7db91f251056f90fec4121f028680ab3153a0f3c
Author:     Taeung Song <treeze.taeung@...il.com>
AuthorDate: Mon, 6 Jun 2016 19:52:54 +0900
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 6 Jun 2016 17:43:19 -0300
perf config: Handle the error when config set is NULL at collect_config()
collect_config() collect all config key-value pairs from config files
and put each config info in config set.  But if config set (i.e. 'set'
variable at collect_config()) is NULL, this is wrong so handle it.
Signed-off-by: Taeung Song <treeze.taeung@...il.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/1465210380-26749-4-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, 5 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index b500737..c73f1c4 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -607,8 +607,12 @@ static int collect_config(const char *var, const char *value,
 	struct perf_config_section *section = NULL;
 	struct perf_config_item *item = NULL;
 	struct perf_config_set *set = perf_config_set;
-	struct list_head *sections = &set->sections;
+	struct list_head *sections;
 
+	if (set == NULL)
+		return -1;
+
+	sections = &set->sections;
 	key = ptr = strdup(var);
 	if (!key) {
 		pr_debug("%s: strdup failed\n", __func__);
Powered by blists - more mailing lists