aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaeung Song <[email protected]>2016-06-06 19:52:54 +0900
committerArnaldo Carvalho de Melo <[email protected]>2016-06-06 17:43:19 -0300
commit7db91f251056f90fec4121f028680ab3153a0f3c (patch)
treea3667022197846d75a9f09d82866c59a4c5bad10
parent78f71c996fb92d129ec75d572e2f5367a4f4c757 (diff)
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 <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/config.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index b50073741b80..c73f1c4d1ca9 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__);