Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410480

[BUGFIX][PATCH v5 3/9] perf config: Handle an error when config set is NULL at collect_config()

Show all headers | View raw

collect_config() collect all config key-value pairs
from a config files and put each config in config set.
But if config set (i.e. 'set' variable at collect_config())
is NULL, this is an error so return -1.

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.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 d013f90..062eeb8 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__);
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[RFC][PATCH v5 0/9] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [BUGFIX][PATCH v5 2/9] perf config: Finally free a config set after collect_config() worked Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [BUGFIX][PATCH v5 1/9] perf config: Let perf_config() return in case of failure Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [PATCH v5 4/9] perf config: Use new perf_config_set__init() to initialize config set Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [PATCH v5 8/9] perf config: Reset the config set at only 'config' sub-command Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [PATCH v5 7/9] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [PATCH v5 5/9] perf config: Add global variable 'config_set' Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [PATCH v5 9/9] perf config: Reimplement show_config() using perf_config() Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200
  [BUGFIX][PATCH v5 3/9] perf config: Handle an error when config set is NULL at collect_config() Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 19:30 +0200

csiph-web