From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbcFPIbu (ORCPT ); Thu, 16 Jun 2016 04:31:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:32892 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751276AbcFPIbr (ORCPT ); Thu, 16 Jun 2016 04:31:47 -0400 Date: Thu, 16 Jun 2016 01:31:05 -0700 From: tip-bot for Taeung Song Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, wangnan0@huawei.com, mingo@kernel.org, treeze.taeung@gmail.com, alexander.shishkin@linux.intel.com, acme@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, mhiramat@kernel.org Reply-To: hpa@zytor.com, namhyung@kernel.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, peterz@infradead.org, treeze.taeung@gmail.com, wangnan0@huawei.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, alexander.shishkin@linux.intel.com In-Reply-To: <1465389413-8936-2-git-send-email-treeze.taeung@gmail.com> References: <1465389413-8936-2-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Handle NULL at perf_config_set__delete() Git-Commit-ID: 826424cc919529d6d234af12c6ba975b63528a74 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: 826424cc919529d6d234af12c6ba975b63528a74 Gitweb: http://git.kernel.org/tip/826424cc919529d6d234af12c6ba975b63528a74 Author: Taeung Song AuthorDate: Wed, 8 Jun 2016 21:36:49 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 14 Jun 2016 09:29:53 -0300 perf config: Handle NULL at perf_config_set__delete() perf_config_set__delete() purge and free the config set that contains all config key-value pairs. But if the config set (i.e. 'set' variable at the function) 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 Cc: Wang Nan Link: http://lkml.kernel.org/r/1465389413-8936-2-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 8749eca..31e09a4 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -742,6 +742,9 @@ static void perf_config_set__purge(struct perf_config_set *set) void perf_config_set__delete(struct perf_config_set *set) { + if (set == NULL) + return; + perf_config_set__purge(set); free(set); }