Messages in this thread Patch in this message | | | Date | Tue, 20 Jun 2017 02:07:35 -0700 | From | tip-bot for Taeung Song <> | Subject | [tip:perf/core] perf config: Check error cases of {show_spec, set}_config() |
| |
Commit-ID: 4f1fd74283582f3f5c34d1c9ed55117d775b4a20 Gitweb: http://git.kernel.org/tip/4f1fd74283582f3f5c34d1c9ed55117d775b4a20 Author: Taeung Song <treeze.taeung@gmail.com> AuthorDate: Sat, 17 Jun 2017 12:46:37 +0900 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Mon, 19 Jun 2017 22:05:54 -0300
perf config: Check error cases of {show_spec, set}_config()
show_spec_config() and set_config() can be called multiple times in the loop in cmd_config().
However, The error cases of them wasn't checked, so fix it.
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/1497671197-20450-1-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/builtin-config.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 7545966..bb1be79 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -225,10 +225,23 @@ int cmd_config(int argc, const char **argv) break; } - if (value == NULL) + if (value == NULL) { ret = show_spec_config(set, var); - else + if (ret < 0) { + pr_err("%s is not configured: %s\n", + var, config_filename); + free(arg); + break; + } + } else { ret = set_config(set, config_filename, var, value); + if (ret < 0) { + pr_err("Failed to set '%s=%s' on %s\n", + var, value, config_filename); + free(arg); + break; + } + } free(arg); } }
| |