From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423113AbcFHIlt (ORCPT ); Wed, 8 Jun 2016 04:41:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53890 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161806AbcFHIlk (ORCPT ); Wed, 8 Jun 2016 04:41:40 -0400 Date: Wed, 8 Jun 2016 01:41:05 -0700 From: tip-bot for Taeung Song Message-ID: 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 Reply-To: peterz@infradead.org, acme@redhat.com, mhiramat@kernel.org, treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, alexander.shishkin@linux.intel.com, jolsa@redhat.com, mingo@kernel.org In-Reply-To: <1465210380-26749-4-git-send-email-treeze.taeung@gmail.com> References: <1465210380-26749-4-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Handle the error when config set is NULL at collect_config() Git-Commit-ID: 7db91f251056f90fec4121f028680ab3153a0f3c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7db91f251056f90fec4121f028680ab3153a0f3c Gitweb: http://git.kernel.org/tip/7db91f251056f90fec4121f028680ab3153a0f3c Author: Taeung Song AuthorDate: Mon, 6 Jun 2016 19:52:54 +0900 Committer: Arnaldo Carvalho de Melo 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 Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1465210380-26749-4-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- 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__);