[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-826424cc919529d6d234af12c6ba975b63528a74@git.kernel.org>
Date: Thu, 16 Jun 2016 01:31:05 -0700
From: tip-bot for Taeung Song <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, peterz@...radead.org, wangnan0@...wei.com,
mingo@...nel.org, treeze.taeung@...il.com,
alexander.shishkin@...ux.intel.com, acme@...hat.com,
jolsa@...hat.com, linux-kernel@...r.kernel.org,
namhyung@...nel.org, hpa@...or.com, mhiramat@...nel.org
Subject: [tip:perf/core] perf config: Handle NULL at
perf_config_set__delete()
Commit-ID: 826424cc919529d6d234af12c6ba975b63528a74
Gitweb: http://git.kernel.org/tip/826424cc919529d6d234af12c6ba975b63528a74
Author: Taeung Song <treeze.taeung@...il.com>
AuthorDate: Wed, 8 Jun 2016 21:36:49 +0900
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
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 <treeze.taeung@...il.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/r/1465389413-8936-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
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);
}
Powered by blists - more mailing lists