Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935232AbcKOKrE (ORCPT ); Tue, 15 Nov 2016 05:47:04 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51060 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935147AbcKOKq6 (ORCPT ); Tue, 15 Nov 2016 05:46:58 -0500 Date: Tue, 15 Nov 2016 02:44:53 -0800 From: tip-bot for Taeung Song Message-ID: Cc: aweee0@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, treeze.taeung@gmail.com, hpa@zytor.com, jolsa@kernel.org, over3025@gmail.com, peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org Reply-To: aweee0@gmail.com, hpa@zytor.com, treeze.taeung@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, jolsa@kernel.org, peterz@infradead.org, tglx@linutronix.de, over3025@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1478241862-31230-4-git-send-email-treeze.taeung@gmail.com> References: <1478241862-31230-4-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Validate config variable arguments before trying use them Git-Commit-ID: 36662794bb520be828df8e2f3404264f5e7a7973 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 Content-Length: 3135 Lines: 106 Commit-ID: 36662794bb520be828df8e2f3404264f5e7a7973 Gitweb: http://git.kernel.org/tip/36662794bb520be828df8e2f3404264f5e7a7973 Author: Taeung Song AuthorDate: Fri, 4 Nov 2016 15:44:19 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 14 Nov 2016 12:57:40 -0300 perf config: Validate config variable arguments before trying use them You can show the values for several config items as below: # perf config report.queue-size call-graph.record-mode but it is necessary to more precisely check arguments, before passing them to show_spec_config(). This validation function would be also used when parsing config key-value pairs arguments in the near future. Committer notes: Testing it: $ perf config bla. The config variable does not contain a variable name: bla. $ perf config .bla The config variable does not contain a section name: .bla $ perf config bla.bla $ Signed-off-by: Taeung Song Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Nambong Ha Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Cc: Wookje Kwon Link: http://lkml.kernel.org/r/1478241862-31230-4-git-send-email-treeze.taeung@gmail.com [ Fix some spelling errors ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-config.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index df3fa1c..88a43fe 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -82,6 +82,27 @@ static int show_config(struct perf_config_set *set) return 0; } +static int parse_config_arg(char *arg, char **var) +{ + const char *last_dot = strchr(arg, '.'); + + /* + * Since "var" actually contains the section name and the real + * config variable name separated by a dot, we have to know where the dot is. + */ + if (last_dot == NULL || last_dot == arg) { + pr_err("The config variable does not contain a section name: %s\n", arg); + return -1; + } + if (!last_dot[1]) { + pr_err("The config variable does not contain a variable name: %s\n", arg); + return -1; + } + + *var = arg; + return 0; +} + int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) { int i, ret = 0; @@ -130,10 +151,26 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) } break; default: - if (argc) - for (i = 0; argv[i]; i++) - ret = show_spec_config(set, argv[i]); - else + if (argc) { + for (i = 0; argv[i]; i++) { + char *var, *arg = strdup(argv[i]); + + if (!arg) { + pr_err("%s: strdup failed\n", __func__); + ret = -1; + break; + } + + if (parse_config_arg(arg, &var) < 0) { + free(arg); + ret = -1; + break; + } + + ret = show_spec_config(set, var); + free(arg); + } + } else usage_with_options(config_usage, config_options); }