diff options
| author |   Taeung Song <treeze.taeung@gmail.com> | 2017-06-17 12:46:37 +0900 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 22:05:54 -0300 |
| commit | 4f1fd74283582f3f5c34d1c9ed55117d775b4a20 (patch) | |
| tree | cdb3dfeb686a9608759d51b1937a16845a3a69de /tools/perf/builtin-config.c | |
| parent | perf ftrace: Add -D option for depth filter (diff) | |
| download | linux-dev-4f1fd74283582f3f5c34d1c9ed55117d775b4a20.tar.xz linux-dev-4f1fd74283582f3f5c34d1c9ed55117d775b4a20.zip | |
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>
Diffstat (limited to 'tools/perf/builtin-config.c')
| -rw-r--r-- | tools/perf/builtin-config.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 75459668edb2..bb1be79bceda 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); } } |