diff options
author | Taeung Song <treeze.taeung@gmail.com> | 2017-06-16 23:46:37 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 21:05:54 -0400 |
commit | 4f1fd74283582f3f5c34d1c9ed55117d775b4a20 (patch) | |
tree | cdb3dfeb686a9608759d51b1937a16845a3a69de | |
parent | 1096c35aa821cc4789a64232a0e210bb87a0e5e8 (diff) |
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>
-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) | |||
225 | break; | 225 | break; |
226 | } | 226 | } |
227 | 227 | ||
228 | if (value == NULL) | 228 | if (value == NULL) { |
229 | ret = show_spec_config(set, var); | 229 | ret = show_spec_config(set, var); |
230 | else | 230 | if (ret < 0) { |
231 | pr_err("%s is not configured: %s\n", | ||
232 | var, config_filename); | ||
233 | free(arg); | ||
234 | break; | ||
235 | } | ||
236 | } else { | ||
231 | ret = set_config(set, config_filename, var, value); | 237 | ret = set_config(set, config_filename, var, value); |
238 | if (ret < 0) { | ||
239 | pr_err("Failed to set '%s=%s' on %s\n", | ||
240 | var, value, config_filename); | ||
241 | free(arg); | ||
242 | break; | ||
243 | } | ||
244 | } | ||
232 | free(arg); | 245 | free(arg); |
233 | } | 246 | } |
234 | } | 247 | } |