From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752873AbcFFUZk (ORCPT ); Mon, 6 Jun 2016 16:25:40 -0400 Received: from mail.kernel.org ([198.145.29.136]:44737 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752802AbcFFUZN (ORCPT ); Mon, 6 Jun 2016 16:25:13 -0400 Date: Mon, 6 Jun 2016 17:25:09 -0300 From: Arnaldo Carvalho de Melo To: Taeung Song Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Jiri Olsa Subject: Re: [BUGFIX][PATCH v6 3/9] perf config: Handle the error when config set is NULL at collect_config() Message-ID: <20160606202509.GC15108@kernel.org> References: <1465210380-26749-1-git-send-email-treeze.taeung@gmail.com> <1465210380-26749-4-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465210380-26749-4-git-send-email-treeze.taeung@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Jun 06, 2016 at 07:52:54PM +0900, Taeung Song escreveu: > 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. Looks ok, applied. - Arnaldo > Cc: Namhyung Kim > Cc: Jiri Olsa > Cc: Masami Hiramatsu > Cc: Alexander Shishkin > Signed-off-by: Taeung Song > --- > 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