From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
mhiramat@kernel.org, acme@redhat.com, treeze.taeung@gmail.com,
peterz@infradead.org, alexander.shishkin@linux.intel.com,
mingo@kernel.org, jolsa@redhat.com, namhyung@kernel.org,
hpa@zytor.com
Subject: [tip:perf/core] perf config: Handle the error when config set is NULL at collect_config()
Date: Wed, 8 Jun 2016 01:41:05 -0700 [thread overview]
Message-ID: <tip-7db91f251056f90fec4121f028680ab3153a0f3c@git.kernel.org> (raw)
In-Reply-To: <1465210380-26749-4-git-send-email-treeze.taeung@gmail.com>
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__);
next prev parent reply other threads:[~2016-06-08 8:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 10:52 [RFC][PATCH v6 0/9] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-06-06 10:52 ` [BUGFIX][PATCH v6 1/9] perf config: Fix the problem of abnormal termination at perf_parse_file() Taeung Song
2016-06-06 20:21 ` Arnaldo Carvalho de Melo
2016-06-08 8:40 ` [tip:perf/core] perf config: Fix " tip-bot for Taeung Song
2016-06-06 10:52 ` [BUGFIX][PATCH v6 2/9] perf config: If collect_config() is failed, finally free a config set after it is done Taeung Song
2016-06-06 20:23 ` Arnaldo Carvalho de Melo
2016-06-06 21:37 ` Taeung Song
2016-06-07 7:44 ` Taeung Song
2016-06-06 10:52 ` [BUGFIX][PATCH v6 3/9] perf config: Handle the error when config set is NULL at collect_config() Taeung Song
2016-06-06 20:25 ` Arnaldo Carvalho de Melo
2016-06-08 8:41 ` tip-bot for Taeung Song [this message]
2016-06-06 10:52 ` [PATCH v6 4/9] perf config: Use new perf_config_set__init() to initialize config set Taeung Song
2016-06-06 10:52 ` [PATCH v6 5/9] perf config: Add global variable 'config_set' Taeung Song
2016-06-06 10:52 ` [PATCH v6 6/9] perf config: Use zfree() instead of free() at perf_config_set__delete() Taeung Song
2016-06-06 10:52 ` [PATCH v6 7/9] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-06-06 10:52 ` [PATCH v6 8/9] perf config: Reset the config set at only 'config' sub-command Taeung Song
2016-06-06 10:53 ` [PATCH v6 9/9] perf config: Reimplement show_config() using perf_config() Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7db91f251056f90fec4121f028680ab3153a0f3c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=treeze.taeung@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).