show_spec_config() and set_config() can be called multiple times in the loop in cmd_config(). However, the return values from them did not checked. Even though one of the return values means a error (i.e. -1), it can be just skipped. It is a bug, so fix it.
Check each return value from show_spec_config() and set_config() in the loop in cmd_config() and if the return value means a error, handle it. Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Reported-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Taeung Song <[email protected]> --- 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); } } -- 2.7.4
