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 <a...@redhat.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Signed-off-by: Taeung Song <treeze.tae...@gmail.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);
                }
        }
-- 
2.7.4

Reply via email to