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

Groups > linux.kernel > #1417077

[tip:perf/core] perf config: Handle the error when config set is NULL at collect_config()

Show all headers | View raw

Commit-ID:  7db91f251056f90fec4121f028680ab3153a0f3c
Gitweb:     http://git.kernel.org/tip/7db91f251056f90fec4121f028680ab3153a0f3c
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Mon, 6 Jun 2016 19:52:54 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.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@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.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@redhat.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__);

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

Thread

[RFC][PATCH v6 0/9] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 13:00 +0200
  [PATCH v6 4/9] perf config: Use new perf_config_set__init() to initialize config set Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 13:00 +0200
  [PATCH v6 9/9] perf config: Reimplement show_config() using perf_config() Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 13:00 +0200
  [BUGFIX][PATCH v6 3/9] perf config: Handle the error when config set is NULL at collect_config() Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 13:00 +0200
    Re: [BUGFIX][PATCH v6 3/9] perf config: Handle the error when config  set is NULL at collect_config() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-06 22:30 +0200
    [tip:perf/core] perf config: Handle the error when config set is  NULL at collect_config() tip-bot for Taeung Song <tipbot@zytor.com> - 2016-06-08 10:50 +0200

csiph-web